Implemented custom request handling for (un)authenticated sessions to worka...

James Moger

2012-08-24 d97e52ef501a72fcf16aee02d7e79c91d123dfe6

 src/com/gitblit/models/RepositoryModel.java

@@ -19,17 +19,12 @@
import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.lib.StoredConfig;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import java.util.Map;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;



/**

@@ -42,11 +37,6 @@
public class RepositoryModel implements Serializable, Comparable<RepositoryModel> {



   private static final long serialVersionUID = 1L;

	
   public static String CUSTOM_DEFINED_PROP_SECTION = "gitblit";

   public static String CUSTOM_DEFINED_PROP_SUBSECTION = "customDefinedProperties";

	
   private final Logger logger = LoggerFactory.getLogger(RepositoryModel.class);



   // field names are reflectively mapped in EditRepository page

   public String name;

@@ -58,6 +48,8 @@
   public boolean useTickets;

   public boolean useDocs;

   public AccessRestrictionType accessRestriction;

   public AuthorizationControl authorizationControl;

   public boolean allowAuthenticated;

   public boolean isFrozen;

   public boolean showReadme;

   public FederationStrategy federationStrategy;

@@ -75,6 +67,7 @@
   public List<String> preReceiveScripts;

   public List<String> postReceiveScripts;

   public List<String> mailingLists;

   public Map<String, String> customFields;

   private String displayName;

   

   public RepositoryModel() {

@@ -87,6 +80,7 @@
      this.owner = owner;

      this.lastChange = lastchange;

      this.accessRestriction = AccessRestrictionType.NONE;

      this.authorizationControl = AuthorizationControl.NAMED;

      this.federationSets = new ArrayList<String>();

      this.federationStrategy = FederationStrategy.FEDERATE_THIS;      

   }

@@ -102,37 +96,6 @@
         }

      }

      return localBranches;

   }

	
   public String getCustomProperty(String propertyKey) {

      try {

         Repository r = GitBlit.self().getRepository(name);

         StoredConfig config = JGitUtils.readConfig(r);

			
         return config.getString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey);

      } catch (Exception e) {

         logger.error("Error getting Custom Property", e);

			
         return null;

      }		
   }

	
   public String setCustomProperty(String propertyKey, String propertyValue) {

      try {

         Repository r = GitBlit.self().getRepository(name);

         StoredConfig config = JGitUtils.readConfig(r);

			
         String oldValue = config.getString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey);

			
         config.setString(CUSTOM_DEFINED_PROP_SECTION, CUSTOM_DEFINED_PROP_SUBSECTION, propertyKey, propertyValue);

         config.save();

			
         return oldValue;

      } catch (Exception e) {

         logger.error("Error getting Custom Property", e);

			
         return null;

      }		
   }



   @Override