core: add '.' to WORD_TOKEN accepted chars

nil0x42 · Mar 6, 2019 · 4d42fce · 4d42fce
1 parent 7f21dc6
commit 4d42fce
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/utils/regex.py b/src/utils/regex.py
@@ -6,4 +6,4 @@
 
 # check is given string is a valid phpsploit word token
 # usage: WORD_TOKEN.fullmatch("string")
-WORD_TOKEN = re.compile("[A-Za-z0-9@_-]+")
+WORD_TOKEN = re.compile("[A-Za-z0-9@_.-]+")
diff --git a/test/commands/alias.sh b/test/commands/alias.sh
@@ -46,8 +46,8 @@ phpsploit_pipe alias > $TMPFILE
 sed -e '1,/---/d' -e '/^$/,$d' $TMPFILE | grep -vq '^    l' || FAIL
 
 # check that alias is equal to it's original command
-phpsploit_pipe alias "'@foo'" lrun ls > $TMPFILE || FAIL
-phpsploit_pipe @foo -ah / > $TMPFILE-alias || FAIL
+phpsploit_pipe alias "'@foo.bar'" lrun ls > $TMPFILE || FAIL
+phpsploit_pipe @foo.bar -ah / > $TMPFILE-alias || FAIL
 phpsploit_pipe lrun ls -ah / > $TMPFILE || FAIL
 diff $TMPFILE-alias $TMPFILE || FAIL
 
@@ -59,7 +59,7 @@ diff $TMPFILE-cmd-override $TMPFILE || FAIL
 
 # but the alias referencing `lrun` still uses real command
 # because phpsploit nested aliases do not exist in phpsploit:
-phpsploit_pipe @foo -ah / > $TMPFILE || FAIL
+phpsploit_pipe @foo.bar -ah / > $TMPFILE || FAIL
 diff $TMPFILE-alias $TMPFILE || FAIL
 
 # thanks to non-nesting, you can alias ls to 'ls /'
@@ -89,13 +89,13 @@ phpsploit_pipe alias > $TMPFILE-ref || FAIL
 # issue #101: crash: IndexError: list index out of range
 # empty string fails
 phpsploit_pipe 'alias "" BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: '' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: '' doesn't match \[A-Za-z0-9@_\.-\]+"
 # string with spaces fails
 phpsploit_pipe 'alias "has space" BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: 'has space' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: 'has space' doesn't match \[A-Za-z0-9@_\.-\]+"
 # ',' (badchar) fails
 phpsploit_pipe 'alias ,bad BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: ',bad' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: ',bad' doesn't match \[A-Za-z0-9@_\.-\]+"
 
 # ensure alias output hasn't changed (because no vars were created)
 phpsploit_pipe alias > $TMPFILE || FAIL

diff --git a/test/commands/env.sh b/test/commands/env.sh
@@ -95,8 +95,8 @@ done
 phpsploit_pipe env FOO BAR > $TMPFILE || FAIL
 [[ "`getval FOO`" == "BAR" ]] || FAIL
 
-phpsploit_pipe env this@ISvalid myval > $TMPFILE || FAIL
-[[ "`getval this@ISvalid`" == "myval" ]] || FAIL
+phpsploit_pipe env this@IS.valid myval > $TMPFILE || FAIL
+[[ "`getval this@IS.valid`" == "myval" ]] || FAIL
 
 ###
 ### CHECK INVALID VAR NAMES
@@ -107,13 +107,13 @@ phpsploit_pipe env > $TMPFILE-ref || FAIL
 
 # empty string fails
 phpsploit_pipe 'env "" BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: '' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: '' doesn't match \[A-Za-z0-9@_\.-\]+"
 # string with spaces fails
 phpsploit_pipe 'env "has space" BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: 'has space' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: 'has space' doesn't match \[A-Za-z0-9@_\.-\]+"
 # ',' (badchar) fails
 phpsploit_pipe 'env ,bad BLA' > $TMPFILE && FAIL
-assert_contains $TMPFILE "\[\!\] Key Error: illegal name: ',bad' doesn't match \[A-Za-z0-9@_-\]+"
+assert_contains $TMPFILE "\[\!\] Key Error: illegal name: ',bad' doesn't match \[A-Za-z0-9@_\.-\]+"
 # special name used to save default values in sessions, should fail
 phpsploit_pipe 'env __DEFAULTS__ BLA' > $TMPFILE && FAIL
 assert_contains $TMPFILE "\[\!\] Key Error: illegal name: '__DEFAULTS__'"

diff --git a/test/interface/command-line-options.sh b/test/interface/command-line-options.sh
@@ -55,7 +55,7 @@ function is_interactive () {
     local script=$TMPFILE-is_interactive.sh
     echo -e "#!/bin/bash\n$@" > $script
     chmod +x $script
-    script -qefc "timeout 4 $script" /dev/null > $TMPFILE-is_interactive 2>&1
+    script -qefc "timeout 6 $script" /dev/null > $TMPFILE-is_interactive 2>&1
     local ret="$?"
     #rm $script
     [ "$ret" -eq 124 ] && return 0 || return 1