create new key generator for shorter repository ids

scm-webapp/src/main/java/sonia/scm/ScmServletModule.java

@@ -80,6 +80,7 @@ import sonia.scm.resources.ResourceManager;
 import sonia.scm.resources.ScriptResourceServlet;
 import sonia.scm.security.CipherHandler;
 import sonia.scm.security.CipherUtil;
+import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.security.EncryptionHandler;
 import sonia.scm.security.KeyGenerator;
 import sonia.scm.security.MessageDigestEncryptionHandler;
@@ -244,7 +245,9 @@ public class ScmServletModule extends ServletModule
     bind(ScmConfiguration.class).toInstance(config);
     bind(PluginLoader.class).toInstance(pluginLoader);
     bind(PluginManager.class, DefaultPluginManager.class);
-    bind(KeyGenerator.class).toInstance(cu.getKeyGenerator());
+
+    // note CipherUtil uses an other generator
+    bind(KeyGenerator.class).to(DefaultKeyGenerator.class);
     bind(CipherHandler.class).toInstance(cu.getCipherHandler());
     bind(EncryptionHandler.class, MessageDigestEncryptionHandler.class);
     bindExtProcessor.bindExtensions(binder());

scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java

@@ -49,6 +49,7 @@ import sonia.scm.HandlerEvent;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.Type;
 import sonia.scm.config.ScmConfiguration;
+import sonia.scm.security.KeyGenerator;
 import sonia.scm.security.ScmSecurityException;
 import sonia.scm.util.AssertUtil;
 import sonia.scm.util.CollectionAppender;
@@ -71,7 +72,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -100,6 +100,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
    *
    * @param configuration
    * @param contextProvider
+   * @param keyGenerator
    * @param securityContextProvider
    * @param repositoryDAO
    * @param handlerSet
@@ -108,7 +109,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
    */
   @Inject
   public DefaultRepositoryManager(ScmConfiguration configuration,
-    SCMContextProvider contextProvider,
+    SCMContextProvider contextProvider, KeyGenerator keyGenerator,
     Provider<WebSecurityContext> securityContextProvider,
     RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
     Provider<Set<RepositoryListener>> repositoryListenersProvider,
@@ -116,6 +117,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
   {
     this.configuration = configuration;
     this.securityContextProvider = securityContextProvider;
+    this.keyGenerator = keyGenerator;
     this.repositoryDAO = repositoryDAO;
     this.repositoryListenersProvider = repositoryListenersProvider;
     this.repositoryHooksProvider = repositoryHooksProvider;
@@ -175,7 +177,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
       throw new RepositoryAllreadyExistExeption();
     }
 
-    repository.setId(UUID.randomUUID().toString());
+    repository.setId(keyGenerator.createKey());
     repository.setCreationDate(System.currentTimeMillis());
 
     if (createRepository)
@@ -967,6 +969,9 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
   /** Field description */
   private Map<String, RepositoryHandler> handlerMap;
 
+  /** Field description */
+  private KeyGenerator keyGenerator;
+
   /** Field description */
   private RepositoryDAO repositoryDAO;
 

scm-webapp/src/main/java/sonia/scm/security/DefaultKeyGenerator.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.security;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.inject.Singleton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Singleton
+public class DefaultKeyGenerator implements KeyGenerator
+{
+
+  /**
+   * the logger for DefaultKeyGenerator
+   */
+  private static final Logger logger =
+    LoggerFactory.getLogger(DefaultKeyGenerator.class);
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public String createKey()
+  {
+    StringBuilder buffer = new StringBuilder();
+
+    buffer.append(Long.toHexString(System.currentTimeMillis()));
+    buffer.append(Long.toHexString(sessionKey.incrementAndGet()));
+    buffer.append(Integer.toHexString(random.nextInt(999)));
+
+    String key = buffer.toString();
+
+    if (logger.isTraceEnabled())
+    {
+      logger.trace("create new key {}", key);
+    }
+
+    return key;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private AtomicLong sessionKey = new AtomicLong();
+
+  /** Field description */
+  private Random random = new Random();
+}