Merge remote-tracking branch 'upstream/master' into mavenize

# Conflicts:
#	opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/history/Repository.java

@@ -540,16 +540,18 @@ static Boolean checkCmd(String... args) {
      * @see #RepoCommand
      */
     protected String ensureCommand(String propertyKey, String fallbackCommand) {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        
         if (RepoCommand != null) {
             return RepoCommand;
         }
-        RepoCommand = RuntimeEnvironment.getInstance()
-                .getRepoCmd(this.getClass().getCanonicalName());
+        
+        RepoCommand = env.getRepoCmd(this.getClass().getCanonicalName());
         if (RepoCommand == null) {
             RepoCommand = System.getProperty(propertyKey, fallbackCommand);
-            RuntimeEnvironment.getInstance()
-                    .setRepoCmd(this.getClass().getCanonicalName(), RepoCommand);
+            env.setRepoCmd(this.getClass().getCanonicalName(), RepoCommand);
         }
+        
         return RepoCommand;
     }
 

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

@@ -201,8 +201,10 @@ public static void main(String argv[]) {
                     IndexVersion.check(checkIndexVersionCfg, subFilesList);
                 } catch (IndexVersionException e) {
                     System.err.printf("Index version check failed: %s\n", e);
-                    System.err.printf("You might want to remove all data " +
-                            "under the DATA_ROOT and to reindex\n");
+                    System.err.printf("You might want to remove " +
+                            (subFilesList.size() > 0 ?
+                            "data for projects " + String.join(",", subFilesList) : "all data") +
+                            " under the DATA_ROOT and to reindex\n");
                     status = 1;
                     System.exit(status);
                 }

opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java

@@ -290,9 +290,9 @@ public IndexSearcher getSearcher() {
      */
     public int search(HttpServletRequest req, String... projectNames) {
         ProjectHelper pHelper = PageConfig.get(req).getProjectHelper();
-        Set<Project> projects = pHelper.getAllProjects();
+        Set<Project> allProjects = pHelper.getAllProjects();
         List<Project> filteredProjects = new ArrayList<Project>();
-        for(Project project: projects) {
+        for(Project project: allProjects) {
             for (String name : projectNames) {
                 if (project.getName().equalsIgnoreCase(name)) {
                     filteredProjects.add(project);

opengrok-indexer/src/test/java/org/opengrok/indexer/history/SCCSRepositoryTest.java

@@ -24,12 +24,14 @@
 package org.opengrok.indexer.history;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -59,16 +61,33 @@ public void tearDown() {
     /**
      * Test of isRepositoryFor method, of class SCCSRepository.
      */
+    private void testIsRepositoryFor(final String fileName, boolean shouldPass) throws IOException {
+        File tdir = Files.createTempDirectory("SCCSrepotest" + fileName).toFile();
+        File test = new File(tdir, fileName);
+        test.mkdirs();
+        tdir.deleteOnExit();
+        test.deleteOnExit();
+        SCCSRepository instance = new SCCSRepository();
+        assertEquals(shouldPass, instance.isRepositoryFor(tdir));
+    }
+    
     @Test
-    public void testIsRepositoryFor() {
-        //test bug 15954
-        File tdir = new File(System.getProperty("java.io.tmpdir")+File.separator+"testogrepo");
-        File test = new File(tdir,"Codemgr_wsdata");
-        test.mkdirs();//TODO fix FileUtilities to not leave over dummy directories in tmp and then use them here ;)
-        SCCSRepository instance = new SCCSRepository();        
-        assertTrue(instance.isRepositoryFor(tdir));
-        test.delete();
-        tdir.delete();
+    public void testIsRepositoryForCodemgr1() throws IOException {
+        testIsRepositoryFor("Codemgr_wsdata", true);
+    }
+    
+    @Test
+    public void testIsRepositoryForCodemgr2() throws IOException {
+        testIsRepositoryFor("codemgr_wsdata", true);
+    }
+    
+    @Test
+    public void testIsRepositoryForCodemgr3() throws IOException {
+        testIsRepositoryFor("SCCS", true);
+    }
+    
+    @Test
+    public void testIsRepositoryForCodemgrNot() throws IOException {
+        testIsRepositoryFor("NOT", false);
     }
-
 }

opengrok-web/pom.xml

@@ -110,6 +110,16 @@
                     <url>${tomcat.url}</url>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <url>http://localhost:8080/manager/text</url>
+                    <server>OpenGrok</server>
+                    <path>/${project.build.finalName}</path>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java

@@ -35,7 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.web.PageConfig;
+import org.opengrok.indexer.web.api.v1.RestApp;
 
 public class AuthorizationFilter implements Filter {
 
@@ -50,6 +50,16 @@ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) thr
         HttpServletRequest httpReq = (HttpServletRequest) sr;
         HttpServletResponse httpRes = (HttpServletResponse) sr1;
 
+        // All RESTful API requests are allowed for now (also see LocalhostFilter).
+        // The /search endpoint will go through authorization via SearchEngine.search()
+        // so does not have to be exempted here.
+        if (httpReq.getServletPath().startsWith(RestApp.API_PATH)) {
+            LOGGER.log(Level.FINER, "Allowing request to {0} in {1}",
+                    new Object[]{ httpReq.getServletPath(), AuthorizationFilter.class.getName() });
+            fc.doFilter(sr, sr1);
+            return;
+        }
+
         PageConfig config = PageConfig.get(httpReq);
         long processTime = System.currentTimeMillis();
 

opengrok-web/src/main/java/org/opengrok/web/api/v1/RestApp.java

@@ -26,9 +26,11 @@
 
 import javax.ws.rs.ApplicationPath;
 
-@ApplicationPath("/api/v1")
+@ApplicationPath(RestApp.API_PATH)
 public class RestApp extends ResourceConfig {
 
+    public static final String API_PATH = "/api/v1";
+    
     public RestApp() {
         packages("org.opengrok.web.api.v1.controller", "org.opengrok.web.api.v1.filter");
     }

test/org/opensolaris/opengrok/history/RepositoryFactoryTest.java

@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.history;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertFalse;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.opensolaris.opengrok.util.TestRepository;
+
+/**
+ * Test RepositoryFactory
+ *
+ * @author Vladimir Kotal
+ */
+public class RepositoryFactoryTest {
+    private static TestRepository repository;
+    
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        repository = new TestRepository();
+        repository.create(RepositoryFactory.class.getResourceAsStream("repositories.zip"));
+    }
+    
+    @AfterClass
+    public static void tearDown() {
+        if (repository != null) {
+            repository.destroy();
+            repository = null;
+        }
+    }
+    
+    /*
+     * There is no conditonal run based on whether given repository is installed because
+     * this test is not supposed to have working Mercurial anyway.
+     */
+    private void testNotWorkingRepository(String repoPath, String propName) 
+            throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+        
+        String origPropValue = System.setProperty(propName, "/foo/bar/nonexistent");
+        File root = new File(repository.getSourceRoot(), repoPath);
+        Repository repo = RepositoryFactory.getRepository(root);
+        if (origPropValue != null) {
+            System.setProperty(propName, origPropValue);
+        }
+        assertFalse(repo.isWorking());
+    }
+    
+    @Test
+    public void testNotWorkingMercurialRepository() 
+            throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+        testNotWorkingRepository("mercurial", MercurialRepository.CMD_PROPERTY_KEY);
+    }
+    
+    @Test
+    public void testNotWorkingBitkeeperRepository() 
+            throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+        testNotWorkingRepository("bitkeeper", BitKeeperRepository.CMD_PROPERTY_KEY);
+    }
+}

tools/sync/command.py

@@ -49,14 +49,16 @@ class Command:
     TIMEDOUT = "timed out"
 
     def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
-                 excl_subst=False, work_dir=None, env_vars=None, timeout=None):
+                 excl_subst=False, work_dir=None, env_vars=None, timeout=None,
+                 redirect_stderr=True):
         self.cmd = cmd
         self.state = "notrun"
         self.excl_subst = excl_subst
         self.work_dir = work_dir
         self.env_vars = env_vars
         self.timeout = timeout
         self.pid = None
+        self.redirect_stderr = redirect_stderr
 
         self.logger = logger or logging.getLogger(__name__)
         logging.basicConfig()
@@ -167,8 +169,18 @@ def close(self):
                 return
 
         timeout_thread = None
-        event = threading.Event()
-        output_thread = OutputThread(event, self.logger)
+        output_event = threading.Event()
+        output_thread = OutputThread(output_event, self.logger)
+
+        # If stderr redirection is off, setup a thread that will capture
+        # stderr data.
+        if self.redirect_stderr:
+            stderr_dest = subprocess.STDOUT
+        else:
+            stderr_event = threading.Event()
+            stderr_thread = OutputThread(stderr_event, self.logger)
+            stderr_dest = stderr_thread
+
         try:
             start_time = time.time()
             try:
@@ -179,10 +191,10 @@ def close(self):
             if self.env_vars:
                 my_env = os.environ.copy()
                 my_env.update(self.env_vars)
-                p = subprocess.Popen(self.cmd, stderr=subprocess.STDOUT,
+                p = subprocess.Popen(self.cmd, stderr=stderr_dest,
                                      stdout=output_thread, env=my_env)
             else:
-                p = subprocess.Popen(self.cmd, stderr=subprocess.STDOUT,
+                p = subprocess.Popen(self.cmd, stderr=stderr_dest,
                                      stdout=output_thread)
 
             self.pid = p.pid
@@ -226,9 +238,15 @@ def close(self):
             # exit the read loop we have to close it here ourselves.
             output_thread.close()
             self.logger.debug("Waiting on output thread to finish reading")
-            event.wait()
-
+            output_event.wait()
             self.out = output_thread.getoutput()
+
+            if not self.redirect_stderr:
+                stderr_thread.close()
+                self.logger.debug("Waiting on stderr thread to finish reading")
+                stderr_event.wait()
+                self.err = stderr_thread.getoutput()
+
             elapsed_time = time.time() - start_time
             self.logger.debug("Command {} took {} seconds".
                               format(self.cmd, int(elapsed_time)))
@@ -286,6 +304,9 @@ def getoutput(self):
         else:
             return None
 
+    def geterroutput(self):
+        return self.err
+
     def getstate(self):
         return self.state
 

tools/sync/projadm.py

@@ -55,14 +55,15 @@ def exec_command(doit, logger, cmd, msg):
     Execute given command and return its output.
     Exit the program on failure.
     """
-    cmd = Command(cmd, logger=logger)
+    cmd = Command(cmd, logger=logger, redirect_stderr=False)
     if not doit:
         logger.info(cmd)
         return
     cmd.execute()
     if cmd.getstate() is not Command.FINISHED or cmd.getretcode() != 0:
         logger.error(msg)
-        logger.error(cmd.getoutput())
+        logger.error("Standard output: {}".format(cmd.getoutput()))
+        logger.error("Error output: {}".format(cmd.geterroutput()))
         sys.exit(1)
 
     return cmd.getoutput()