check URI

fixes #2446

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/mirror.py

@@ -42,7 +42,8 @@
 from .utils.opengrok import get_repos, get_config_value, get_repo_type
 from .utils.readconfig import read_config
 from .utils.repofactory import get_repository
-from .utils.utils import is_exe, check_create_dir, get_int, diff_list
+from .utils.utils import is_exe, check_create_dir, get_int, diff_list,\
+    is_web_uri
 from .scm.repository import RepositoryException
 
 
@@ -51,7 +52,7 @@
     print("Need Python 3, you are running {}".format(major_version))
     sys.exit(1)
 
-__version__ = "0.3"
+__version__ = "0.4"
 
 # "constants"
 HOOK_TIMEOUT_PROPERTY = 'hook_timeout'
@@ -163,11 +164,10 @@ def main():
         check_create_dir(logger, logdir)
 
     uri = args.uri
-    if not uri:
-        logger.error("URI of the web application not specified")
+    if not is_web_uri(uri):
+        logger.error("Not a URI: {}".format(uri))
         sys.exit(1)
-
-    logger.debug("URI = {}".format(uri))
+    logger.debug("web application URI = {}".format(uri))
 
     source_root = get_config_value(logger, 'sourceRoot', uri)
     if not source_root:

opengrok-tools/src/main/python/opengrok_tools/projadm.py

@@ -39,7 +39,7 @@
 from .utils.filelock import Timeout, FileLock
 from .utils.opengrok import get_configuration, set_configuration, \
     add_project, delete_project, get_config_value
-from .utils.utils import get_command
+from .utils.utils import get_command, is_web_uri
 
 MAJOR_VERSION = sys.version_info[0]
 if (MAJOR_VERSION < 3):
@@ -297,9 +297,10 @@ def main():
             sys.exit(1)
 
     uri = args.uri
-    if not uri:
-        logger.error("URI of the webapp not specified")
+    if not is_web_uri(uri):
+        logger.error("Not a URI: {}".format(uri))
         sys.exit(1)
+    logger.debug("web application URI = {}".format(uri))
 
     lock = FileLock(os.path.join(tempfile.gettempdir(),
                                  os.path.basename(sys.argv[0]) + ".lock"))

opengrok-tools/src/main/python/opengrok_tools/sync.py

@@ -43,6 +43,7 @@
 from .utils.filelock import Timeout, FileLock
 from .utils.opengrok import list_indexed_projects, get_config_value
 from .utils.readconfig import read_config
+from .utils.utils import is_web_uri
 
 major_version = sys.version_info[0]
 if (major_version < 3):
@@ -105,6 +106,9 @@ def main():
     logger = logging.getLogger(os.path.basename(sys.argv[0]))
 
     uri = args.uri
+    if not is_web_uri(uri):
+        logger.error("Not a URI: {}".format(uri))
+        sys.exit(1)
     logger.debug("web application URI = {}".format(uri))
 
     # Changing working directory to root will avoid problems when running