.

Author: jimdigriz

nbgitpuller/config.py

@@ -5,11 +5,10 @@
 import time
 import argparse
 import datetime
-from traitlets import Integer, default
+from traitlets import Bool, CRegExp, Integer, List, Unicode, Union, default
 from traitlets.config import Configurable
 from functools import partial
 
-from config import NbGitPullerFeatures
 
 def execute_cmd(cmd, **kwargs):
     """
@@ -51,6 +50,35 @@ def flush():
 
 
 class GitPuller(Configurable):
+    autorun_allow = Union(
+        [List(CRegExp()), Bool()],
+        default_value=False,
+        config=True,
+        help="""
+        List of URLs described as Python regular expressions (using re.match()) where we
+        allow autorunning scripts in the pulled project as a pre-initialisation step.
+        Enable this only if you understand and accept the risks of AUTORUN.INF.
+
+        When set to boolean True, all URLs are allowed, whilst False (default) autorun
+        is disable completely.
+        """
+    )
+
+    autorun_script = List(
+        Unicode(),
+        default_value=[],
+        config=True,
+        help="""
+        List of scripts to search for when attempting to autorun. The first match will
+        be run with a single argument of 'init' or 'update' depending on what nbgitpuller
+        is doing.
+
+        Only used if autorun_allow is changed from its default of False.
+
+        Enable this only if you understand and accept the risks of AUTORUN.INF.
+        """
+    )
+
     depth = Integer(
         config=True,
         help="""
@@ -82,19 +110,6 @@ def __init__(self, git_url, repo_dir, **kwargs):
         elif not self.branch_exists(self.branch_name):
             raise ValueError(f"Branch: {self.branch_name} -- not found in repo: {self.git_url}")
 
-        features = NbGitPullerFeatures(parent=kwargs.get("parent"))
-        if features.autorun_allow is True:
-            self._autorun = True
-        elif isinstance(features.autorun_allow, list):
-            self._autorun = any(( re.match(pattern, git_url) for pattern in features.autorun_allow ))
-        else:
-            self._autorun = False
-        if self._autorun:
-            if isinstance(features.autorun_script, list):
-                self._autorun_script = features.autorun_script
-            else:
-                self._autorun = False
-
         self.repo_dir = repo_dir
         newargs = {k: v for k, v in kwargs.items() if v is not None}
         super(GitPuller, self).__init__(**newargs)
@@ -162,7 +177,10 @@ def autorun(self, operation="method"):
         """
         Search for and execute the autorun script.
         """
-        if not self._autorun:
+
+        if not self.autorun_allow:
+            return
+        if not any(( re.match(pattern, self.git_url) for pattern in self.autorun_allow )):
             return
 
         script = next(( s for s in self._autorun_script if os.path.exists(os.path.join(self.repo_dir, s)) ), None)