From 69815408c89936ea5dd456826a335653e4f72d9c Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Mon, 28 Nov 2022 18:02:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8F=8D?= =?UTF-8?q?=E5=86=99ssid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Xdecrypt.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Xdecrypt.py b/Xdecrypt.py index 2a6795e..3637aca 100644 --- a/Xdecrypt.py +++ b/Xdecrypt.py @@ -23,7 +23,8 @@ def decrypt_string(a1, a2): config_path = "" parser = argparse.ArgumentParser(description="xsh, xfp password decrypt") -parser.add_argument("-s", "--sid", default="", type=str, help="`username`+`sid`, user `whoami /user` in command.") +parser.add_argument("-u", "--user", default="", type=str, help="`username`,`whoami` in command.") +parser.add_argument("-s", "--sid", default="", type=str, help="`sid`,`whoami /user` in command.") parser.add_argument("-p", "--password", default="", type=str, help="the password in sessions or path of sessions") args = parser.parse_args() @@ -46,7 +47,7 @@ def decrypt_string(a1, a2): args.sid = GetUserName() + ConvertSidToStringSid(LookupAccountName(GetComputerName(), GetUserName())[0]) if not os.path.isdir(args.password): - r = decrypt_string(args.sid, args.password) + r = decrypt_string(args.sid[::-1]+args.user, args.password) if r: print(r) @@ -59,7 +60,6 @@ def decrypt_string(a1, a2): cfg.read(filepath) except UnicodeDecodeError: cfg.read(filepath, encoding="utf-16") - try: if f.endswith(".xsh"): host = "{}:{}".format(cfg["CONNECTION"]["Host"], cfg["CONNECTION"]["Port"]) @@ -69,6 +69,8 @@ def decrypt_string(a1, a2): host = "{}:{}".format(cfg["Connection"]["Host"], cfg["Connection"]["Port"]) username = cfg["Connection"]["UserName"] password = decrypt_string(args.sid, cfg["Connection"]["Password"]) + print(args.sid) + print(cfg["CONNECTION:AUTHENTICATION"]["Password"]) print( f"{filepath:=^100}\nHost: {host}\nUsername: {username}\nPassword: {password}") except Exception as e: From c267496501fe6b0c39feaf6f3a0667cd9befb25c Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:43:06 +0800 Subject: [PATCH 2/7] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7786b0b..d980b01 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ xsh, xfp password decrypt optional arguments: -h, --help show this help message and exit - -s SID, --sid SID `username`+`sid`, user `whoami /user` in command. + -u USER, --user USER `username`,`whoami` in command. + -s SID, --sid SID `sid`,`whoami /user` in command. -p PASSWORD, --password PASSWORD the password in sessions or path of sessions ``` @@ -57,6 +58,6 @@ Host: 192.168.1.2:22 Username: root Password: test -$ python Xdecrypt.py -s username+sid -p password +$ python Xdecrypt.py -u username -s sid -p password test -``` \ No newline at end of file +``` From 25cbaf34a5433d5342a99815e49b2469e7b21871 Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:47:12 +0800 Subject: [PATCH 3/7] Update Xdecrypt.py --- Xdecrypt.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Xdecrypt.py b/Xdecrypt.py index 3637aca..879b2d1 100644 --- a/Xdecrypt.py +++ b/Xdecrypt.py @@ -69,8 +69,6 @@ def decrypt_string(a1, a2): host = "{}:{}".format(cfg["Connection"]["Host"], cfg["Connection"]["Port"]) username = cfg["Connection"]["UserName"] password = decrypt_string(args.sid, cfg["Connection"]["Password"]) - print(args.sid) - print(cfg["CONNECTION:AUTHENTICATION"]["Password"]) print( f"{filepath:=^100}\nHost: {host}\nUsername: {username}\nPassword: {password}") except Exception as e: From 45baaa450774a47f93a3162b9cbc81baff3b67f1 Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:50:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d980b01..3fbdcda 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Host: 192.168.1.2:22 Username: root Password: test -$ python3 Xdecrypt.py -s username+sid -p "D:\somewhere\NetSarang Computer" +$ python3 Xdecrypt.py -u username -s sid -p "D:\somewhere\NetSarang Computer" =============D:\somewhere\NetSarang Computer\6\Xftp\Sessions\192.168.1.2.xfp============= Host: 192.168.1.2:22 Username: root From ece9209671c0451e5362b02cf5c5b8cc9792aa96 Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:52:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fbdcda..006e6e9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ pip3 install -r requirements.txt ## Usage ``` -usage: Xdecrypt.py [-h] [-s SID] [-p PASSWORD] +usage: Xdecrypt.py [-h] [-u USERNMAE] [-s SID] [-p PASSWORD] xsh, xfp password decrypt From e4192594ae7f1314a2dfa34e09f04ef7fa0904e4 Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 11:14:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A7=A3=E6=9E=90=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Xdecrypt.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Xdecrypt.py b/Xdecrypt.py index 879b2d1..e9fbe0f 100644 --- a/Xdecrypt.py +++ b/Xdecrypt.py @@ -26,6 +26,7 @@ def decrypt_string(a1, a2): parser.add_argument("-u", "--user", default="", type=str, help="`username`,`whoami` in command.") parser.add_argument("-s", "--sid", default="", type=str, help="`sid`,`whoami /user` in command.") parser.add_argument("-p", "--password", default="", type=str, help="the password in sessions or path of sessions") +parser.add_argument("-v","--version",default="",type=str,help="xshell's version") args = parser.parse_args() if not args.password: @@ -45,12 +46,13 @@ def decrypt_string(a1, a2): args.sid = tmp[::-1] else: args.sid = GetUserName() + ConvertSidToStringSid(LookupAccountName(GetComputerName(), GetUserName())[0]) - if not os.path.isdir(args.password): - r = decrypt_string(args.sid[::-1]+args.user, args.password) + if args.version == "7": + r = decrypt_string(args.sid[::-1] + args.user, args.password) + else: + r = decrypt_string(args.user+args.sid, args.password) if r: print(r) - for root, dirs, files in os.walk(args.password): for f in files: if f.endswith(".xsh") or f.endswith(".xfp"): From 92ca027365aafcb390b122a11abb64f33195fa55 Mon Sep 17 00:00:00 2001 From: evil <75650712+wdnmdgdx741@users.noreply.github.com> Date: Wed, 30 Nov 2022 11:16:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 006e6e9..eb87ee0 100644 --- a/README.md +++ b/README.md @@ -10,17 +10,16 @@ pip3 install -r requirements.txt ## Usage ``` usage: Xdecrypt.py [-h] [-u USERNMAE] [-s SID] [-p PASSWORD] - xsh, xfp password decrypt - +``` optional arguments: -h, --help show this help message and exit -u USER, --user USER `username`,`whoami` in command. -s SID, --sid SID `sid`,`whoami /user` in command. -p PASSWORD, --password PASSWORD the password in sessions or path of sessions -``` - + -v VERSION, --version VERSION + xshell's version ``` $ whoami /user 用户信息