Changeset 484

Timestamp:

Nov 16, 2023, 2:47:20 PM (12 months ago)

Author:

alloc

Message:

Scripts: Command execution monitor fixes

File:

• scripts/usr/local/lib/7dtd/monitor-log.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -92 +92 @@
         local cmd="$1"
         local name="$2"
-        
-        echo "$(timestamp): Player \"$name\" executed \"$cmd\"" >> $COMMANDLOG
+        local clientInfo="$3"
+        
+        echo "$(timestamp): Player \"$name\" executed \"$cmd\" (client $clientInfo)" >> $COMMANDLOG
 
         for H in $(getHooksFor remoteCommand $INSTANCE); do
+                $H $INSTANCE "$cmd" "$name"
+        done
+}
+
+handleRemoteCommandDenied() {
+        local cmd="$1"
+        local name="$2"
+        local clientInfo="$3"
+        
+        echo "$(timestamp): Denied \"$name\" to exec command \"$cmd\" (client $clientInfo)" >> $COMMANDLOG
+
+        for H in $(getHooksFor remoteCommandDenied $INSTANCE); do
                 $H $INSTANCE "$cmd" "$name"
         done
@@ -180 +193 @@
                 #Executing command ".*" from client ".*"$ 
                 elif [ -n "$(echo "$line" | grep '^Executing command '.*' from client')" ]; then 
-                        cmd=$(expr "$line" : "Executing command '\(.*\)' from client .*$") 
-                        nick=$(expr "$line" : "Executing command '.*' from client \(.*\)$") 
-                        handleRemoteCommand "$cmd" "$nick"
-                        unset cmd nick
+                        cmd=$(expr "$line" : "Executing command '\(.*\)' from client EntityID=.*, PltfmId='.*', CrossId='.*', OwnerID='.*', PlayerName='.*', ClientNumber='.*'$") 
+                        clientInfo=$(expr "$line" : "Executing command '.*' from client \(.*\)$")
+                        playerName=$(expr "$line" : "Executing command '.*' from client EntityID=.*, PltfmId='.*', CrossId='.*', OwnerID='.*', PlayerName='\(.*\)', ClientNumber='.*'$") 
+                        handleRemoteCommand "$cmd" "$playerName" "$clientInfo"
+                        unset cmd playerName clientInfo
+                #Denying command ".*" from client ".*"$ 
+                elif [ -n "$(echo "$line" | grep '^Denying command '.*' from client')" ]; then 
+                        cmd=$(expr "$line" : "Denying command '\(.*\)' from client EntityID=.*, PltfmId='.*', CrossId='.*', OwnerID='.*', PlayerName='.*', ClientNumber='.*'$") 
+                        clientInfo=$(expr "$line" : "Denying command '.*' from client \(.*\)$")
+                        playerName=$(expr "$line" : "Denying command '.*' from client EntityID=.*, PltfmId='.*', CrossId='.*', OwnerID='.*', PlayerName='\(.*\)', ClientNumber='.*'$") 
+                        handleRemoteCommandDenied "$cmd" "$playerName" "$clientInfo"
+                        unset cmd playerName clientInfo
                 #Executing command ".*" by Telnet from .*$ 
                 elif [ -n "$(echo "$line" | grep '^Executing command '.*' by Telnet from ')" ]; then