Commit Graph

195 Commits

Author SHA1 Message Date
Simone Bordet 75e4ccc7ba Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-13 23:39:35 +01:00
Lachlan Roberts 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
Simone Bordet b1d231b9e7 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-11 16:45:12 +01:00
Lachlan 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
Lachlan Roberts 39aac30137 Issue #4138 - Changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-11 13:51:48 +11:00
Joakim Erdfelt e103a5e1a7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
2019-11-07 13:25:04 -06:00
Lachlan 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
Joakim Erdfelt 65dc704d32
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-10-24 10:58:45 -05:00
Joakim Erdfelt 1ed13b6b30 Updating to version 9.4.23-SNAPSHOT 2019-10-22 09:19:41 -05:00
Joakim Erdfelt b1e6b55512 Updating to version 9.4.22.v20191022 2019-10-22 08:20:50 -05:00
Lachlan 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
Lachlan Roberts 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
Lachlan Roberts 337b6c1439 Issue #4138 - Changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-17 15:59:21 +11:00
Lachlan Roberts 039fb38070 Issue #4138 - use HttpClient for OpenID Authentication
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-16 16:26:21 +11:00
Travis Spencer 46d3a371cf Use HttpClient instead of HttpURLConnection
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-15 08:50:33 +02:00
Simone Bordet e2a493d7b0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-08 09:52:21 +02:00
Travis Spencer 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
Lachlan Roberts 3f6119eb13 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 2019-10-08 09:33:03 +11:00
Lachlan 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
Lachlan 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
Travis Spencer 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
Travis Spencer 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
Joakim Erdfelt d7a189fa18 Updating to version 10.0.0-SNAPSHOT 2019-10-03 12:05:26 -05:00
Joakim Erdfelt fd6a2cb9f6 Updating to version 10.0.0.alpha1 2019-10-03 11:25:06 -05:00
Joakim Erdfelt 6fc42d8ba2 Merge branch 'release-9.4.21' into jetty-9.4.x 2019-10-01 13:35:43 -05:00
Lachlan Roberts b83dd8472d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-01 16:06:58 +10:00
Travis Spencer 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
Joakim Erdfelt 7807eafad9 Updating to version 9.4.22-SNAPSHOT 2019-09-26 10:46:28 -05:00
Joakim Erdfelt 72970db61a Updating to version 9.4.21.v20190926 2019-09-26 09:59:15 -05:00
Lachlan Roberts eef6e21366 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-09-17 11:01:23 +10:00
Lachlan Roberts 42f1214796 fix OpenID module after rename of authenticateNewUsers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-17 10:54:22 +10:00
olivier lamy 85705ca8eb fix build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-14 09:11:16 +10:00
Simone Bordet 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
Lachlan Roberts eb1c77daf4 remove empty lines
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 10:22:15 +10:00
Lachlan Roberts fbd1ba0c09 add missing licence header
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 13:00:22 +10:00
Lachlan Roberts 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 c67ac736df implement serializable for auth in cluster
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-10 10:21:38 +10:00
Lachlan Roberts 9134def345 OpenIdAuthenticator javadoc update
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-09 17:34:39 +10:00
Lachlan Roberts dc26739502 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-09 16:58:36 +10:00
Lachlan Roberts be69598a48 add javadoc
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-09 14:57:35 +10:00
Lachlan Roberts 2770afb280 fix claim validation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-06 16:03:22 +10:00
Lachlan Roberts f592e63711 add configuration to authenticate new users with a base LoginService
improved comments

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-30 14:33:41 +10:00
Lachlan Roberts 2323dffb52 fix build problems
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-30 09:51:53 +10:00
Lachlan Roberts 19369636e3 add additional validation, renaming and cleanups
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-29 17:47:37 +10:00
Lachlan Roberts d33b96f411 add OpenId module to support OpenId Connect authentication
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-29 08:03:11 +10:00