Skip to content

Commit

Permalink
Update Jetty to 10.0.6
Browse files Browse the repository at this point in the history 
- this is the same version eclipse platform currently uses
- update servlet-api to 4.0
- configure keystore used by AppServer with Subject Alternative Names
  for host name and ip address to satisfy more strict SNI checking in
  Jetty 10. See jetty/jetty.project#5379
- add jetty bundles to JGit-dependency-bundles in the jgit p2 repository

Bug: 571932
Bug: 576100
Change-Id: Ibd0240cf7ad4dc201947fd69707f517c3c1fc1c8
  • Loading branch information
@msohn
msohn committed Nov 22, 2021
1 parent 2e2a364 commit f91e47f
Show file tree
Hide file tree
Showing 23 changed files with 252 additions and 231 deletions.
30 changes: 15 additions & 15 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,55 +243,55 @@ maven_jar(
sha1 = "431fc3cbc0ff81abdbfde070062741089c3ba874",
)

JETTY_VER = "9.4.44.v20210927"
JETTY_VER = "10.0.6"

maven_jar(
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
sha1 = "1cb43a0d74b7395c7207dbf3dc2ca97eac89f5fd",
src_sha1 = "2bbc54fc1835c963744a4e82ba2541e94fcbcf9b",
sha1 = "482165726bf54dd10ee7e2aeb4ae9481eee0c878",
src_sha1 = "8a8173a0bc6c0d215fc9fb9ba5fd50bae1690f9c",
)

maven_jar(
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
sha1 = "ecb80b8e008daa46e95e5691b2611d4007922497",
src_sha1 = "d67d4705a08d9b76592b3e177e2bb1aac968d832",
sha1 = "513f44ed9636ca5e0adefa0c0b81511065dfddd2",
src_sha1 = "2e7eb2edbf1592e15b338096651e379fea860859",
)

maven_jar(
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
sha1 = "0bf2de0d31925a8ca71ad80f721236850b636e0d",
src_sha1 = "3582cbf081cf3652f6507093585c2a0f3b8738bb",
sha1 = "125ee07e4d8182a6afca00d543f6a4dcc84f2678",
src_sha1 = "5c0789872ec6743ae893131ae81262aaefc87fe6",
)

maven_jar(
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
sha1 = "37f0e30cdc02128e40d095ad63cb18e10ecb7726",
src_sha1 = "7f1a6e3ab54e541f33b8ed100d553d4034d2e3a9",
sha1 = "4c8eed25d577002a6c0f9f3ef340eb581390f696",
src_sha1 = "ac7214d6202ee0cbc4bdbcf90c7906ca716e84e5",
)

maven_jar(
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
sha1 = "a2ec01e2b5552b777a3d7085163f80756ef8c1ce",
src_sha1 = "6262966b3cd10ff6b98f0bed428640bbbe4f7e79",
sha1 = "1ab82ae5dfdbb07f0ffa07f28274fdf30e3e96ee",
src_sha1 = "c59082f3a09c024fafc281f432b67432d398b8c0",
)

maven_jar(
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
sha1 = "3c7151c5a04a93119988b48a1577a972d90f8990",
src_sha1 = "f7f0420221772bc63ebae21571bb9925ca971a82",
sha1 = "4e2935749ea1c9fcabba61a857f8283c7f5f9885",
src_sha1 = "6baba651899c044e14ba37d43934950670d2aa4e",
)

maven_jar(
name = "jetty-util-ajax",
artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER,
sha1 = "ed2f30e8eef939ab2825e607d83f82f85167e2c0",
src_sha1 = "1a48ae7a45683d20afb90784d1db314be2c73c92",
sha1 = "a801d4b5f5e906f134713ae82fd1ea10a15902c6",
src_sha1 = "f35f5525a5d30dc1237b85457d758d578e3ce8d0",
)

BOUNCYCASTLE_VER = "1.69"
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Export-Package: org.eclipse.jgit.http.server;version="6.0.0",
javax.servlet.http"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
javax.servlet.http;version="[2.5.0,5.0.0)",
org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)",
Expand Down
30 changes: 14 additions & 16 deletions org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,25 @@ Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
javax.servlet.http;version="[2.5.0,5.0.0)",
org.apache.commons.codec;version="[1.6.0,2.0.0)",
org.apache.commons.codec.binary;version="[1.6.0,2.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
org.apache.http.client;version="[4.4.0,5.0.0)",
org.apache.http.message;version="[4.3.0,5.0.0)",
org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[10.0.0,11.0.0)",
org.eclipse.jetty.io;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)",
org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)",
org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)",
Expand Down
25 changes: 12 additions & 13 deletions org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
javax.servlet.http;version="[2.5.0,5.0.0)",
org.apache.commons.logging;version="[1.1.1,2.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)",
org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)",
org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)",
org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
Expand Down
44 changes: 26 additions & 18 deletions org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,23 @@
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.security.AbstractLoginService;
import org.eclipse.jetty.security.Authenticator;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.RolePrincipal;
import org.eclipse.jetty.security.UserPrincipal;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
Expand Down Expand Up @@ -143,13 +146,15 @@ public AppServer(int port, int sslPort) {
}

if (sslPort >= 0) {
SslContextFactory sslContextFactory = createTestSslContextFactory(
hostName);
SslContextFactory.Server sslContextFactory = createTestSslContextFactory(
hostName, ip);
secureConfig = new HttpConfiguration(config);
secureConnector = new ServerConnector(server,
new SslConnectionFactory(sslContextFactory,
HttpVersion.HTTP_1_1.asString()),
new HttpConnectionFactory(secureConfig));
secureConfig.addCustomizer(new SecureRequestCustomizer());
HttpConnectionFactory http11 = new HttpConnectionFactory(
secureConfig);
SslConnectionFactory tls = new SslConnectionFactory(
sslContextFactory, http11.getProtocol());
secureConnector = new ServerConnector(server, tls, http11);
secureConnector.setPort(sslPort);
secureConnector.setHost(ip);
} else {
Expand All @@ -171,8 +176,9 @@ public AppServer(int port, int sslPort) {
server.setHandler(log);
}

private SslContextFactory createTestSslContextFactory(String hostName) {
SslContextFactory.Client factory = new SslContextFactory.Client(true);
private SslContextFactory.Server createTestSslContextFactory(
String hostName, String ip) {
SslContextFactory.Server factory = new SslContextFactory.Server();

String dName = "CN=,OU=,O=,ST=,L=,C=";

Expand All @@ -190,6 +196,8 @@ private SslContextFactory createTestSslContextFactory(String hostName) {
"-keystore", keyStore.getAbsolutePath(), //
"-storepass", keyPassword,
"-alias", hostName, //
"-ext",
String.format("san=IP:%s,DNS:%s", ip, hostName), //
"-genkeypair", //
"-keyalg", "RSA", //
"-keypass", keyPassword, //
Expand Down Expand Up @@ -260,12 +268,12 @@ public ServletContextHandler authBasic(ServletContextHandler ctx,
}

static class TestMappedLoginService extends AbstractLoginService {
private String role;
private RolePrincipal role;

protected final Map<String, UserPrincipal> users = new ConcurrentHashMap<>();

TestMappedLoginService(String role) {
this.role = role;
this.role = new RolePrincipal(role);
}

@Override
Expand All @@ -277,16 +285,16 @@ protected void doStart() throws Exception {
}

@Override
protected String[] loadRoleInfo(UserPrincipal user) {
if (users.get(user.getName()) == null) {
return null;
}
return new String[] { role };
protected UserPrincipal loadUserInfo(String user) {
return users.get(user);
}

@Override
protected UserPrincipal loadUserInfo(String user) {
return users.get(user);
protected List<RolePrincipal> loadRoleInfo(UserPrincipal user) {
if (users.get(user.getName()) == null) {
return null;
}
return Collections.singletonList(role);
}
}

Expand Down
30 changes: 14 additions & 16 deletions org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,25 @@ Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
javax.servlet.http;version="[3.1.0,5.0.0)",
org.apache.http;version="[4.4.0,5.0.0)",
org.apache.http.client;version="[4.4.0,5.0.0)",
org.apache.http.client.methods;version="[4.4.0,5.0.0)",
org.apache.http.entity;version="[4.4.0,5.0.0)",
org.apache.http.impl.client;version="[4.4.0,5.0.0)",
org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.io;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.nio;version="[9.4.5,10.0.0)",
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[10.0.0,11.0.0)",
org.eclipse.jetty.io;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.security.authentication;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server;version="[10.0.0,11.0.0)",
org.eclipse.jetty.server.handler;version="[10.0.0,11.0.0)",
org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)",
org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Export-Package: org.eclipse.jgit.lfs.server;version="6.0.0";
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
javax.servlet;version="[3.1.0,4.0.0)",
javax.servlet.annotation;version="[3.1.0,4.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
javax.servlet;version="[3.1.0,5.0.0)",
javax.servlet.annotation;version="[3.1.0,5.0.0)",
javax.servlet.http;version="[3.1.0,5.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
org.eclipse.jgit.internal;version="[6.0.0,6.1.0)",
Expand Down
46 changes: 44 additions & 2 deletions org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,52 @@
<bundle id="javaewah.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javax.servlet">
<bundle id="jakarta.servlet-api">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javax.servlet.source">
<bundle id="jakarta.servlet-api.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.http">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.http.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.io">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.io.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.security">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.security.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.server">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.server.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.servlet">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.servlet.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.util">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.util.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.util.ajax">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.eclipse.jetty.util.ajax.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="net.i2p.crypto.eddsa">
Expand Down
Loading

0 comments on commit f91e47f

Please sign in to comment.