276 Commits

Author SHA1 Message Date
Jesse McConnell
571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Jesse McConnell
c928c1be29 [Bug #377067] add Negotiate option for security which is an alternative for Spnego 2012-06-14 15:45:41 -05:00
Greg Wilkins
5415517cc0 jetty-9 organize imports 2012-06-05 14:06:18 +02:00
Greg Wilkins
c318cb8167 jetty-9 jetty-security passing tests 2012-06-05 14:02:44 +02:00
Jesse McConnell
cf214ffeef Merge branch 'master' into jetty-8 2012-05-24 08:35:22 -05:00
Jan Bartel
37bce89b8f 379909 FormAuthenticator Rembers only the URL of first Request before authentication 2012-05-22 13:13:10 +02:00
Greg Wilkins
d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Jesse McConnell
c7a4c80da5 [Bug 373421] address potential race condition related to the nonce queue
removing the same nonce twice
2012-03-16 15:39:10 -05:00
Jesse McConnell
fc1e57a315 fix line in spnego readme 2012-03-16 12:44:21 -05:00
Jesse McConnell
eed2a2a0f7 Merge from master 2012-02-21 11:38:28 -06:00
Jesse McConnell
c771766aae updates to spnego doc 2012-02-21 08:40:20 -06:00
Jesse McConnell
098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Greg Wilkins
a4a5e56aeb 371162 NPE protection for nested security handlers 2012-02-10 11:58:19 +11:00
Jesse McConnell
349804c5e7 Merge branch 'master' into jetty-8 2012-01-26 15:43:46 -06:00
Greg Wilkins
ce2dd8e30e 368773 allow authentication to be set by non securityHandler handlers 2012-01-27 08:39:11 +11:00
Jesse McConnell
ab94c48735 merge from master 2012-01-26 10:44:21 -06:00
Greg Wilkins
eeb8d61f1f 368773 always set an indentity service 2012-01-26 23:15:17 +11:00
Jesse McConnell
8f9722bf4a Merge branch 'master' into jetty-8 2012-01-20 11:42:18 -06:00
Thomas Becker
de16f76725 369048: one more test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:42 +11:00
Thomas Becker
a594734241 369048: more test cases for ConstraintSecurityHandler
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:24 +11:00
Jesse McConnell
90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Greg Wilkins
c1b2eedadc 368773 process data constraints without realm 2012-01-17 22:53:53 +11:00
Jan Bartel
70961bc53b Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 18:23:55 +11:00
Jan Bartel
e4123d5d48 368215 Remove debug from jaspi 2012-01-10 17:47:14 +11:00
Jan Bartel
1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jan Bartel
ee0ba9ceb1 Merge remote-tracking branch 'origin/master' into bug-359329 2011-12-15 20:22:37 +11:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
2011-11-30 16:27:30 +11:00
Greg Wilkins
55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins
b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Jan Bartel
127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins
7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Jesse McConnell
2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Jesse McConnell
81e58f1f71 [Bug 362447] add setMaxNonceAge() to DigestAuthenticator 2011-11-02 16:39:22 -05:00
Greg Wilkins
61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jan Bartel
fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins
a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins
cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Greg Wilkins
0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins
6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Jan Bartel
e8b8c659b0 Add mechanism to indicate to FormAuthModule that a deferred authentication is being requested, but for a call to Request.getRemoteUser,
where there is no opportunity to issue a challenge.
2011-10-18 10:41:19 +11:00
Jan Bartel
32dbb1bddb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-deploy/src/main/config/etc/jetty-deploy.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
Jan Bartel
9678aad6e9 Debug printlns plus commented out Deferred auth 2011-10-03 18:21:28 +11:00
Jesse McConnell
53b9f1cc7e [Bug 336443] add missing comma in DigestAuthenticator string 2011-09-29 16:57:30 -05:00
Jesse McConnell
c17552ee50 [323311] apply 5th patch of thomas, also removed extra method on IdentityService since it appears not needed, moved behavior to loadUsers() method instead. 2011-09-20 10:11:26 -05:00
Thomas Becker
129a66f579 323311: HashLoginService uses PropertyUserStore now 2011-09-20 10:11:26 -05:00
Thomas Becker
95ee2157bd JETTY-1414 applied to PropertyUserStore 2011-09-20 10:11:26 -05:00
Thomas Becker
1e30a58419 HashLoginService code format 2011-09-20 10:11:26 -05:00
Greg Wilkins
b7b567d86d 353627 Basic Auth checks that Basic method has been send 2011-09-20 17:16:58 +10:00
Greg Wilkins
57bd9f3bce 336443 Check nonce count is increasing 2011-09-20 17:04:01 +10:00
Jesse McConnell
7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00