Commits

Sebastian Sdorra committed 3111f25

translate path for scmp plugin installation, see issue #586

Comments (0)

Files changed (3)

scm-core/src/main/java/sonia/scm/io/ZipUnArchiver.java

 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.Platform;
 import sonia.scm.util.IOUtil;
+import sonia.scm.util.SystemUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
   }
 
   /**
+   * Translate path of zip entries.
+   *
+   *
+   * @param translatePath true to enable path translation.
+   *
+   * @return {@code this}
+   *
+   * @since 1.39
+   */
+  public ZipUnArchiver translatePath(boolean translatePath)
+  {
+    this.translatePath = translatePath;
+
+    return this;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param path
+   * @param platform
+   *
+   * @return
+   */
+  @VisibleForTesting
+  String translatePath(String path, Platform platform)
+  {
+    String result;
+
+    if (platform.isWindows())
+    {
+      result = path.replace("/", "\\");
+    }
+    else
+    {
+      result = path.replace("\\", "/");
+    }
+
+    return result;
+  }
+
+  /**
    * Method description
    *
    *
       throw new IllegalArgumentException("name is invalid");
     }
 
+    if (translatePath)
+    {
+      name = translatePath(name);
+    }
+
     return new File(outputDirectory, name);
   }
 
       IOUtil.close(output);
     }
   }
+
+  /**
+   * Method description
+   *
+   *
+   * @param path
+   *
+   * @return
+   */
+  private String translatePath(String path)
+  {
+    return translatePath(path, SystemUtil.getPlatform());
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private boolean translatePath;
 }

scm-core/src/test/java/sonia/scm/io/ZipUnArchiverTest.java

+/**
+ * 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.io;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.junit.Test;
+
+import sonia.scm.Platform;
+
+import static org.junit.Assert.*;
+
+import static org.mockito.Mockito.*;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ZipUnArchiverTest
+{
+
+  /**
+   * Constructs ...
+   *
+   */
+  public ZipUnArchiverTest() {}
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void translatePath()
+  {
+    ZipUnArchiver zua = new ZipUnArchiver();
+
+    Platform p = mock(Platform.class);
+
+    when(p.isWindows()).thenReturn(Boolean.FALSE);
+    assertEquals("some/path/to/translate",
+      zua.translatePath("some\\path\\to\\translate", p));
+    when(p.isWindows()).thenReturn(Boolean.TRUE);
+    assertEquals("some\\path\\to\\translate",
+      zua.translatePath("some/path/to/translate", p));
+  }
+}

scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java

 
     try
     {
-      new ZipUnArchiver().extractArchive(packageStream, tempDirectory);
+      //J-
+      new ZipUnArchiver()
+        .translatePath(true)
+        .extractArchive(packageStream, tempDirectory);
+      //J+
 
       Plugin plugin = JAXB.unmarshal(new File(tempDirectory, "plugin.xml"),
                         Plugin.class);
       aph.install(plugin.getInformation().getId());
       plugin.getInformation().setState(PluginState.INSTALLED);
       installedPlugins.put(plugin.getInformation().getId(), plugin);
-
     }
     finally
     {