7ea35d78c5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-28 13:39:50 +10:00
5f2c96dc58
use the OpenID Token expiry time for the initial authentication only, and not for expiry of the session.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-27 10:02:38 +10:00
f1b4bdbbf2
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 17:17:53 +10:00
e03c740ee8
Issue #5064 - the OpenIdCredentials should be serializable
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 09:48:30 +10:00
c09e4d6f86
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 08:46:29 +10:00
de1b6745c5
the DO NOT EDIT comment in .mod files should start with '#'
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +10:00
fb6a445639
Issue #4741 No Servlet Path ( #4898 )
...
* Issue #4741 HttpServletMapping
This completes the refactoring started in #4851 , using
the HttpServletMapping field to avoid having the servletPath field
in the Request and instead have a pathInContext field.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4741 HttpServletMapping
reverted ResourceService changes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4741 HttpServletMapping
fixed gzip handler
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4741 HttpServletMapping
Fixed several TODOs left in the code
removed _contextPath field and used an attributes lookup for include
replaced setContextPaths with setContext
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4741 HttpServletMapping
Used the same pattern from the contextPath changes for servletPath and pathInfo. Now the servletPathMapping is always set on the request and only if the dispatch is an include do the effected methods look deeper for the source values.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4741 HttpServletMapping
Improved javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-28 12:17:22 +02:00
6694f94cd5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:50:19 +02:00
0de5976651
Issue 4235 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-14 21:34:26 +10:00
4bc32e314b
Issue #4235 - communicate reason of OpenID auth failure to error page
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 21:36:41 +11:00
f8d9f82eff
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'.
2020-03-18 11:40:11 +01:00
57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
...
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
org.eclipse.jetty.util.log.Logger but as
simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
to org.eclipse.jetty.logging.StacklessLogging found in
the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
+ and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
+ Also adding note to jetty-util classes that are used by
jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
1393c0e92b
Issue #4400 - Review HttpClient's ContentProvider.
...
Introduced Request.Content with a reactive model to provide
request content.
Introduced RequestContentAdapter to wrap ContentProviders
into Request.Content.
Updated implementation to use the reactive model rather than
the old pull model.
Reimplemented all ContentProviders in terms of Request.Content.
Converted most of the tests from ContentProvider to Request.Content.
Updated proxy servlets and documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-28 14:40:48 +01:00
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
9b5aa73f59
Fixes #3385 Modernize jetty-util-ajax.
...
Added type parameter to methods that were using raw types.
Updated the implementation to use generics.
Deprecated static methods.
Updated usages.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-14 13:14:16 +01:00
1f8ad08281
Fixing Checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:56:06 -06:00
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
8d2465c8ad
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 15:46:41 +01:00
0d4e07ea1e
fix OpenIdAuthenticationTest for windows build
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-04 13:31:06 +11:00
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
2dbd19f902
Merge pull request #4343 from eclipse/jetty-10.0.x-4342-OpenIdHttpClient
...
Issue #4342 - fix creation of HttpClient in jetty-openid.xml for jetty10
2019-11-22 08:58:48 +11:00
091c6f22e6
Issue #4342 - fix creation of HttpClient in jetty-openid.xml for jetty10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-21 16:00:40 +11:00
c34faa125f
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# build-resources/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/infinispan-common/pom.xml
# jetty-infinispan/infinispan-embedded-query/pom.xml
# jetty-infinispan/infinispan-embedded/pom.xml
# jetty-infinispan/infinispan-remote-query/pom.xml
# jetty-infinispan/infinispan-remote/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-openid/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-api/pom.xml
# jetty-websocket/jetty-websocket-common/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-core/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/jetty-jmh/pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-cdi-common-webapp/pom.xml
# tests/test-webapps/test-felix-webapp/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-owb-cdi-webapp/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
# tests/test-webapps/test-weld-cdi-webapp/pom.xml
2019-11-20 07:16:38 -06:00
cff6bb444a
Issue #4128 - test the decoding of OpenId Credentials ( #4166 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-20 14:23:19 +11:00
75e4ccc7ba
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-13 23:39:35 +01:00
4e43258785
Issue #4236 - move redirect code to utility method
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-13 17:19:09 +11:00
b1d231b9e7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-11 16:45:12 +01:00
7b9f7ab37e
Merge pull request #4207 from eclipse/jetty-9.4.x-4189-OpenIdHttpClient
...
Issue #4138 - use HttpClient for OpenID Authentication
2019-11-11 13:52:41 +11:00
39aac30137
Issue #4138 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-11 13:51:48 +11:00
18e7ee5940
Issue #4237 - allow openid module to be configured without context xml ( #4244 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 10:53:25 +11:00
a9e543c1c0
Issue #4227 - do not use encodeRedirectURL for openid redirects ( #4233 )
...
* Issue #4227 - do not use encodeRedirectURL for openid redirects
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-22 22:47:29 +11:00
ed74a459a7
Issue #4138 - only warn if metadata issuer is not consistent with config
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-18 10:31:50 +11:00
337b6c1439
Issue #4138 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-17 15:59:21 +11:00
039fb38070
Issue #4138 - use HttpClient for OpenID Authentication
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-16 16:26:21 +11:00
46d3a371cf
Use HttpClient instead of HttpURLConnection
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-15 08:50:33 +02:00
1d5ceee267
Issue #4132 Allow token and authorization endpoints to be configured
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-08 01:04:34 +02:00
6e698df4d3
Merge pull request #4135 from travisspencer/4134-fix-aud
...
Issue #4134 - Validate audience (aud) claim as list or string, not just string
2019-10-08 09:28:22 +11:00
acf4eeff65
Merge pull request #4129 from travisspencer/fix-4128
...
Issue #4128 - Add missing padding and use URL decoder
2019-10-08 09:17:12 +11:00
1c6202658e
Validate aud claim as list or string, not just string
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-06 18:00:32 +02:00
8b37a8f7fe
Issue #4128 - Add missing padding and use URL decoder
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-05 18:06:26 +02:00
201264d17b
Don't add scopes if none are provided
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-09-28 18:05:48 +02:00
42f1214796
fix OpenID module after rename of authenticateNewUsers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-17 10:54:22 +10:00
b3912d54fe
Fixes #137 - Support OAuth.
...
Review and code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-13 22:01:57 +02:00
eb1c77daf4
remove empty lines
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 10:22:15 +10:00
fbd1ba0c09
add missing licence header
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 13:00:22 +10:00
85cdc0d6c4
Reworked OpenId demo into test using a local test OpenIdProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 12:14:47 +10:00
Lachlan Roberts
Greg Wilkins
Simone Bordet
Joakim Erdfelt
olivier lamy
Travis Spencer