feat: windows openssh 修复 (closed TencentBlueKing#2353)

wyyalt · Jul 30, 2024 · 33232ac · 33232ac
1 parent 7cd281c
commit 33232ac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/backend/components/collections/agent_new/install.py b/apps/backend/components/collections/agent_new/install.py
@@ -720,7 +720,7 @@ def convert_shell_to_powershell(cls, shell_cmd):
         # Convert mkdir -p xxx to if not exist xxx mkdir xxx
         shell_cmd = re.sub(
             r"mkdir -p\s+(\S+)",
-            r"powershell -c 'if (-Not (Test-Path -Path \1)) { New-Item -ItemType Directory -Path \1 }'",
+            r"if (-Not (Test-Path -Path \1)) { New-Item -ItemType Directory -Path \1 }",
             shell_cmd,
         )
 
@@ -730,15 +730,15 @@ def convert_shell_to_powershell(cls, shell_cmd):
         # Convert curl to Invoke-WebRequest
         # shell_cmd = re.sub(
         #     r"curl\s+(http[s]?:\/\/[^\s]+)\s+-o\s+(\/?[^\s]+)\s+--connect-timeout\s+(\d+)\s+-sSfg",
-        #     r"powershell -c 'Invoke-WebRequest -Uri \1 -OutFile \2 -TimeoutSec \3 -UseBasicParsing'",
+        #     r"Invoke-WebRequest -Uri \1 -OutFile \2 -TimeoutSec \3 -UseBasicParsing",
         #     shell_cmd,
         # )
         shell_cmd = re.sub(r"(curl\s+\S+\s+-o\s+\S+\s+--connect-timeout\s+\d+\s+-sSfg)", r'cmd /c "\1"', shell_cmd)
 
         # Convert nohup xxx &> ... & to xxx (ignore nohup, output redirection and background execution)
         shell_cmd = re.sub(
             r"nohup\s+([^&>]+)(\s*&>\s*.*?&)?",
-            r"powershell -c 'Invoke-Command -Session (New-PSSession) -ScriptBlock { \1 } -AsJob'",
+            r"Invoke-Command -Session (New-PSSession) -ScriptBlock { \1 } -AsJob",
             shell_cmd,
         )
 

diff --git a/apps/backend/constants.py b/apps/backend/constants.py
@@ -165,4 +165,4 @@ def needs_batch_request(self) -> bool:
 DEFAULT_ALIVE_TIME = 30
 DEFAULT_CLEAN_RECORD_LIMIT = 5000
 
-POWERSHELL_SERVICE_CHECK_SSHD = "powershell -c Get-Service -Name sshd"
+POWERSHELL_SERVICE_CHECK_SSHD = "Get-Service -Name sshd"
diff --git a/script_tools/setup_pagent.py b/script_tools/setup_pagent.py
@@ -199,7 +199,7 @@ def logging(
 
 JOB_PRIVATE_KEY_RE = re.compile(r"^(-{5}BEGIN .*? PRIVATE KEY-{5})(.*?)(-{5}END .*? PRIVATE KEY-{5}.?)$")
 
-POWERSHELL_SERVICE_CHECK_SSHD = "powershell -c Get-Service -Name sshd"
+POWERSHELL_SERVICE_CHECK_SSHD = "Get-Service -Name sshd"
 
 
 def is_ip(ip: str, _version: Optional[int] = None) -> bool:
@@ -318,7 +318,7 @@ def convert_shell_to_powershell(shell_cmd):
     # Convert mkdir -p xxx to if not exist xxx mkdir xxx
     shell_cmd = re.sub(
         r"mkdir -p\s+(\S+)",
-        r"powershell -c 'if (-Not (Test-Path -Path \1)) { New-Item -ItemType Directory -Path \1 }'",
+        r"if (-Not (Test-Path -Path \1)) { New-Item -ItemType Directory -Path \1 }",
         shell_cmd,
     )
 
@@ -328,15 +328,15 @@ def convert_shell_to_powershell(shell_cmd):
     # Convert curl to Invoke-WebRequest
     # shell_cmd = re.sub(
     #     r"curl\s+(http[s]?:\/\/[^\s]+)\s+-o\s+(\/?[^\s]+)\s+--connect-timeout\s+(\d+)\s+-sSfg",
-    #     r"powershell -c 'Invoke-WebRequest -Uri \1 -OutFile \2 -TimeoutSec \3 -UseBasicParsing'",
+    #     r"Invoke-WebRequest -Uri \1 -OutFile \2 -TimeoutSec \3 -UseBasicParsing",
     #     shell_cmd,
     # )
     shell_cmd = re.sub(r"(curl\s+\S+\s+-o\s+\S+\s+--connect-timeout\s+\d+\s+-sSfg)", r'cmd /c "\1"', shell_cmd)
 
     # Convert nohup xxx &> ... & to xxx (ignore nohup, output redirection and background execution)
     shell_cmd = re.sub(
         r"nohup\s+([^&>]+)(\s*&>\s*.*?&)?",
-        r"powershell -c 'Invoke-Command -Session (New-PSSession) -ScriptBlock { \1 } -AsJob'",
+        r"Invoke-Command -Session (New-PSSession) -ScriptBlock { \1 } -AsJob",
         shell_cmd,
     )