diff options
| author | James Moger <james.moger@gitblit.com> | 2011-10-23 10:25:39 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-10-23 10:25:39 -0400 |
| commit | d03aff630cbcd49f02d51f08ec59ac3cf7f41d0e (patch) | |
| tree | a523cdbbf325ecfe22e73a4f5939e3d93fa8f432 /src/com/gitblit/RpcFilter.java | |
| parent | 16038ce2adf5f06f75230150f75d110a804414c1 (diff) | |
| download | gitblit-d03aff630cbcd49f02d51f08ec59ac3cf7f41d0e.tar.gz gitblit-d03aff630cbcd49f02d51f08ec59ac3cf7f41d0e.zip | |
Separate management from administration in rpc servlet.
Added skeleton mechanism to update server settings via rpc.
Diffstat (limited to 'src/com/gitblit/RpcFilter.java')
| -rw-r--r-- | src/com/gitblit/RpcFilter.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/gitblit/RpcFilter.java b/src/com/gitblit/RpcFilter.java index 2786f2a4..551ca3c6 100644 --- a/src/com/gitblit/RpcFilter.java +++ b/src/com/gitblit/RpcFilter.java @@ -60,7 +60,7 @@ public class RpcFilter extends AuthenticationFilter { String fullUrl = getFullUrl(httpRequest);
RpcRequest requestType = RpcRequest.fromName(httpRequest.getParameter("req"));
if (requestType == null) {
- httpResponse.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);
+ httpResponse.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);
return;
}
@@ -75,22 +75,23 @@ public class RpcFilter extends AuthenticationFilter { boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, false);
boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true);
-
- // Wrap the HttpServletRequest with the RpcServletnRequest which
+
+ // Wrap the HttpServletRequest with the RpcServletRequest which
// overrides the servlet container user principal methods.
AuthenticatedRequest authenticatedRequest = new AuthenticatedRequest(httpRequest);
UserModel user = getUser(httpRequest);
if (user != null) {
authenticatedRequest.setUser(user);
}
-
- // conditionally reject rpc administration requests
- if (adminRequest && !GitBlit.getBoolean(Keys.web.enableRpcAdministration, false)) {
- logger.warn(Keys.web.enableRpcAdministration + " must be set TRUE for administrative rpc requests.");
+
+ // conditionally reject rpc management/administration requests
+ if (adminRequest && !GitBlit.getBoolean(Keys.web.enableRpcManagement, false)) {
+ logger.warn(Keys.web.enableRpcManagement
+ + " must be set TRUE for management/administrative rpc requests.");
httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
-
+
// BASIC authentication challenge and response processing
if ((adminRequest && authenticateAdmin) || (!adminRequest && authenticateView)) {
if (user == null) {
|