From 90ddf5bcf1a4cd719a8d5997a9ed3cafc36f1e04 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Thu, 13 Sep 2012 18:13:20 -0400
Subject: [PATCH] EmptyRepositoryPage_es.html: up-to date with the last changes
---
src/com/gitblit/wicket/GitBlitWebSession.java | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 58ba495..7ecc05b 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -1,22 +1,47 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket;
+import java.util.Map;
import java.util.TimeZone;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.RedirectToUrlException;
import org.apache.wicket.Request;
import org.apache.wicket.Session;
+import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
+
+import com.gitblit.models.UserModel;
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
- protected TimeZone timezone = null;
+ protected TimeZone timezone;
- private User user = null;
+ private UserModel user;
+
+ private String errorMessage;
- private String errorMessage = null;
-
+ private String requestUrl;
+
public GitBlitWebSession(Request request) {
super(request);
}
@@ -24,6 +49,46 @@
public void invalidate() {
super.invalidate();
user = null;
+ }
+
+ /**
+ * Cache the requested protected resource pending successful authentication.
+ *
+ * @param pageClass
+ */
+ public void cacheRequest(Class<? extends Page> pageClass) {
+ // build absolute url with correctly encoded parameters?!
+ Request req = WebRequestCycle.get().getRequest();
+ Map<String, ?> params = req.getRequestParameters().getParameters();
+ PageParameters pageParams = new PageParameters(params);
+ String relativeUrl = WebRequestCycle.get().urlFor(pageClass, pageParams).toString();
+ requestUrl = RequestUtils.toAbsolutePath(relativeUrl);
+ if (isTemporary())
+ {
+ // we must bind the temporary session into the session store
+ // so that we can re-use this session for reporting an error message
+ // on the redirected page and continuing the request after
+ // authentication.
+ bind();
+ }
+ }
+
+ /**
+ * Continue any cached request. This is used when a request for a protected
+ * resource is aborted/redirected pending proper authentication. Gitblit
+ * no longer uses Wicket's built-in mechanism for this because of Wicket's
+ * failure to properly handle parameters with forward-slashes. This is a
+ * constant source of headaches with Wicket.
+ *
+ * @return false if there is no cached request to process
+ */
+ public boolean continueRequest() {
+ if (requestUrl != null) {
+ String url = requestUrl;
+ requestUrl = null;
+ throw new RedirectToUrlException(url);
+ }
+ return false;
}
public boolean isLoggedIn() {
@@ -34,14 +99,18 @@
if (user == null) {
return false;
}
- return user.canAdmin();
+ return user.canAdmin;
+ }
+
+ public String getUsername() {
+ return user == null ? "anonymous" : user.username;
}
- public User getUser() {
+ public UserModel getUser() {
return user;
}
- public void setUser(User user) {
+ public void setUser(UserModel user) {
this.user = user;
}
@@ -55,11 +124,11 @@
}
return timezone;
}
-
+
public void cacheErrorMessage(String message) {
this.errorMessage = message;
}
-
+
public String clearErrorMessage() {
String msg = errorMessage;
errorMessage = null;
--
Gitblit v1.9.1