Added status icon

James Moger

2011-10-26 a70b43cde76b4baab82b4ce0d9ff82883f80b8df

 src/com/gitblit/RpcServlet.java

@@ -22,7 +22,6 @@
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Properties;



import javax.servlet.ServletException;

import javax.servlet.http.HttpServletRequest;

@@ -30,6 +29,7 @@


import com.gitblit.Constants.RpcRequest;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.ServerSettings;

import com.gitblit.models.UserModel;

import com.gitblit.utils.HttpUtils;

import com.gitblit.utils.RpcUtils;

@@ -64,6 +64,8 @@
      logger.info(MessageFormat.format("Rpc {0} request from {1}", reqType,

            request.getRemoteAddr()));



      boolean allowAdmin = GitBlit.getBoolean(Keys.web.enableRpcAdministration, false);



      UserModel user = (UserModel) request.getUserPrincipal();



      Object result = null;

@@ -95,7 +97,11 @@
      } else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) {

         // create repository

         RepositoryModel model = deserialize(request, response, RepositoryModel.class);

         GitBlit.self().updateRepositoryModel(model.name, model, true);

         try {

            GitBlit.self().updateRepositoryModel(model.name, model, true);

         } catch (GitBlitException e) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) {

         // edit repository

         RepositoryModel model = deserialize(request, response, RepositoryModel.class);

@@ -104,7 +110,11 @@
         if (repoName == null) {

            repoName = model.name;

         }

         GitBlit.self().updateRepositoryModel(repoName, model, false);

         try {

            GitBlit.self().updateRepositoryModel(repoName, model, false);

         } catch (GitBlitException e) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) {

         // delete repository

         RepositoryModel model = deserialize(request, response, RepositoryModel.class);

@@ -112,7 +122,11 @@
      } else if (RpcRequest.CREATE_USER.equals(reqType)) {

         // create user

         UserModel model = deserialize(request, response, UserModel.class);

         GitBlit.self().updateUserModel(model.username, model, true);

         try {

            GitBlit.self().updateUserModel(model.username, model, true);

         } catch (GitBlitException e) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.EDIT_USER.equals(reqType)) {

         // edit user

         UserModel model = deserialize(request, response, UserModel.class);

@@ -121,11 +135,17 @@
         if (username == null) {

            username = model.username;

         }

         GitBlit.self().updateUserModel(username, model, false);

         try {

            GitBlit.self().updateUserModel(username, model, false);

         } catch (GitBlitException e) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.DELETE_USER.equals(reqType)) {

         // delete user

         UserModel model = deserialize(request, response, UserModel.class);

         GitBlit.self().deleteUser(model.username);

         if (!GitBlit.self().deleteUser(model.username)) {

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) {

         // get repository members

         RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);

@@ -136,44 +156,69 @@
         Collection<String> names = deserialize(request, response, RpcUtils.NAMES_TYPE);

         List<String> users = new ArrayList<String>(names);

         if (!GitBlit.self().setRepositoryUsers(model, users)) {

            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);

            response.setStatus(failureCode);

         }

      } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {

         // return the list of federation registrations

         result = GitBlit.self().getFederationRegistrations();

         if (allowAdmin) {

            result = GitBlit.self().getFederationRegistrations();

         } else {

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) {

         // return the list of federation result registrations

         if (GitBlit.canFederate()) {

         if (allowAdmin && GitBlit.canFederate()) {

            result = GitBlit.self().getFederationResultRegistrations();

         } else {

            response.sendError(HttpServletResponse.SC_FORBIDDEN);

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) {

         // return the list of federation proposals

         if (GitBlit.canFederate()) {

         if (allowAdmin && GitBlit.canFederate()) {

            result = GitBlit.self().getPendingFederationProposals();

         } else {

            response.sendError(HttpServletResponse.SC_FORBIDDEN);

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) {

         // return the list of federation sets

         if (GitBlit.canFederate()) {

         if (allowAdmin && GitBlit.canFederate()) {

            String gitblitUrl = HttpUtils.getGitblitURL(request);

            result = GitBlit.self().getFederationSets(gitblitUrl);

         } else {

            response.sendError(HttpServletResponse.SC_FORBIDDEN);

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) {

         // return the server's settings

         Properties settings = new Properties();			
         List<String> keys = GitBlit.getAllKeys(null);

         for (String key:keys) {

            String value = GitBlit.getString(key, null);

            if (value != null) {

               settings.put(key, value);

         ServerSettings settings = GitBlit.self().getSettingsModel();

         if (allowAdmin) {

            // return all settings

            result = settings;

         } else {

            // return management settings only

            String[] keys = { Keys.realm.minPasswordLength, Keys.realm.passwordStorage,

                  Keys.federation.sets };

            ServerSettings managementSettings = new ServerSettings();

            for (String key : keys) {

               managementSettings.add(settings.get(key));

            }

            result = managementSettings;

         }

         result = settings;

      } else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) {

         // update settings on the server

         if (allowAdmin) {

            Map<String, String> settings = deserialize(request, response,

                  RpcUtils.SETTINGS_TYPE);

            GitBlit.self().updateSettings(settings);

         } else {

            response.sendError(notAllowedCode);

         }

      } else if (RpcRequest.LIST_STATUS.equals(reqType)) {

         // return the server's status information

         if (allowAdmin) {

            result = GitBlit.self().getStatus();

         } else {

            response.sendError(notAllowedCode);

         }

      }



      // send the result of the request