diff options
| author | James Moger <james.moger@gitblit.com> | 2012-11-30 16:15:14 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-11-30 16:15:14 -0500 |
| commit | d7f4a1baf51f3cb869518d133a882c99dddf021b (patch) | |
| tree | 9a44fd2a94e1a973c30e2ce58afb1e1f6909a62d | |
| parent | e5c7795dc9185272365ff340698c7d2f1e6f11ab (diff) | |
| download | gitblit-d7f4a1baf51f3cb869518d133a882c99dddf021b.tar.gz gitblit-d7f4a1baf51f3cb869518d133a882c99dddf021b.zip | |
Fixed regression on certificate authentication of servlets
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 870e22fb..69135c49 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -58,6 +58,7 @@ import javax.servlet.ServletContextListener; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.resource.ContextRelativeResource;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -574,8 +575,12 @@ public class GitBlit implements ServletContextListener { // grab real user model and preserve certificate serial number
UserModel user = getUserModel(model.username);
if (user != null) {
- GitBlitWebSession session = GitBlitWebSession.get();
- session.authenticationType = AuthenticationType.CERTIFICATE;
+ RequestCycle requestCycle = RequestCycle.get();
+ if (requestCycle != null) {
+ // flag the Wicket session, if this is a Wicket request
+ GitBlitWebSession session = GitBlitWebSession.get();
+ session.authenticationType = AuthenticationType.CERTIFICATE;
+ }
X509Metadata metadata = HttpUtils.getCertificateMetadata(httpRequest);
logger.info(MessageFormat.format("{0} authenticated by client certificate {1} from {2}",
user.username, metadata.serialNumber, httpRequest.getRemoteAddr()));
@@ -589,8 +594,12 @@ public class GitBlit implements ServletContextListener { // Grab cookie from Browser Session
UserModel user = authenticate(cookies);
if (user != null) {
- GitBlitWebSession session = GitBlitWebSession.get();
- session.authenticationType = AuthenticationType.COOKIE;
+ RequestCycle requestCycle = RequestCycle.get();
+ if (requestCycle != null) {
+ // flag the Wicket session, if this is a Wicket request
+ GitBlitWebSession session = GitBlitWebSession.get();
+ session.authenticationType = AuthenticationType.COOKIE;
+ }
logger.info(MessageFormat.format("{0} authenticated by cookie from {1}",
user.username, httpRequest.getRemoteAddr()));
return user;
|