make sure scp does not get an additional parameter as last argument

[schsh.git] / schsh

diff --git a/schsh b/schsh
index e9464de65dfd0309d025af018be937e9efac1612..f079112fa6ffe77920d9151ad4de22c080b5dd94 100755 (executable)
--- a/schsh
+++ b/schsh
@@ -2,7 +2,25 @@
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
 # Configuration
 shell = None # set to "/bin/bash" or similar to allow shell access
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
 # Configuration
 shell = None # set to "/bin/bash" or similar to allow shell access

-allowCommands = ["scp", "rsync", "/usr/lib/openssh/sftp-server"]
+
+def allowSCP(run):
+       if len(run) != 3: return False
+       if run[0] != "scp": return False
+       if run[1] not in ("-f", "-t"): return False
+       if run[2].startswith('-'): return False
+       return True
+
+def allowRSync(run):
+       if len(run) < 3: return False
+       if run[0] != "rsync": return False
+       if run[1] != "--server": return False
+       return True
+
+def allowSFTP(run):
+       if len(run) != 1: return False
+       return run[0] == "/usr/lib/openssh/sftp-server"
+
+allowCommands = [allowSCP, allowRSync, allowSFTP]

 commandPaths = ["/usr/bin", "/bin"]
 
 # END of Configuration
 commandPaths = ["/usr/bin", "/bin"]
 
 # END of Configuration


@@ -27,6 +45,12 @@ def logquit(msg):
        log(msg, logging.ERROR)
        sys.exit(1)
 
        log(msg, logging.ERROR)
        sys.exit(1)
 

+def commandAllowed(run):
+       for allowed in allowCommands:
+               if allowed(run):
+                       return True
+       return False
+

 def addPath(prog):
        if prog.startswith("/"):
                return prog
 def addPath(prog):
        if prog.startswith("/"):
                return prog


@@ -48,7 +72,7 @@ if len(sys.argv) == 1:
 elif len(sys.argv) == 3 and sys.argv[1] == "-c":
        # check if the command is allowed, and add path
        run = shlex.split(sys.argv[2])
 elif len(sys.argv) == 3 and sys.argv[1] == "-c":
        # check if the command is allowed, and add path
        run = shlex.split(sys.argv[2])

-       if len(run) > 0 and run[0] in allowCommands:
+       if commandAllowed(run):

                run[0] = addPath(run[0])
                log("Running '"+str(run)+"'")
        else:
                run[0] = addPath(run[0])
                log("Running '"+str(run)+"'")
        else: