7.20 auto-commit

CHANGELOG.txt

@@ -1,3 +1,9 @@
+7.20
+* 减少被检测的可能性
+* 优化锁机制，可对所有API资源加锁
+* 修复模拟器兼容性
+* 其他小修改及修复
+
 7.15
 * 支持安卓 14 (SDK 34)
 * 修复注册监视器异常的问题

DISCLAIMER.TXT

@@ -1,4 +1,4 @@
-为了下载使用由 rev1si0n (账号 github.com/rev1si0n，邮箱 ihaven0emmail@gmail.com)（以下简称“本人”）
+为了下载使用由 rev1si0n (账号 github.com/rev1si0n，邮箱 lamda.devel@gmail.com)（以下简称“本人”）
 个人开发的软件 LAMDA（以下简称“本服务”），您应当阅读并遵守本协议。请您务必审慎阅读、充分理解各条款内容，并选择接受或不接受。
 除非您已阅读并接受本协议所有条款，否则您将无权下载、安装或使用本软件及相关服务。
 您的下载、安装、使用等行为即视为您已阅读并同意受到本声明的约束。

README.md

@@ -26,4 +26,4 @@ LAMDA 是一个用于逆向及自动化的辅助框架，设计为减少安全
 
 ![中间人流量分析动图演示](image/mitm.gif)
 
-当然，LAMDA 的能力不止于如上种种，他是你强有力的设备控制及管理工具，如果您对他感兴趣，请转到 [使用文档](https://github.com/rev1si0n/lamda/wiki)。
+当然，LAMDA 的能力不止于如上种种，他是你强有力的控制及管理工具，如果您感兴趣，请转到 [使用文档](https://github.com/rev1si0n/lamda/wiki)。

SECURITY.md

@@ -4,9 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-|   5.x   | :white_check_mark: |
 |   7.x   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-mailto:ihaven0emmail@gmail.com
+mailto:lamda.devel@gmail.com

lamda/__init__.py

@@ -1,5 +1,5 @@
-# Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+# Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-__version__ = "7.15"
+__version__ = "7.20"

lamda/bcast.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/client.py

@@ -738,7 +738,7 @@ def register_none_op_watcher(self, name, conditions):
         func = lambda: self.stub.registerNoneOpWatcher(req).value
         self.watchers[name]["enable"] = func
     def _remove_watcher(self, name):
-        return self.stub.removeWatcher(protos.String(value=name))
+        return self.stub.removeWatcher(protos.String(value=name)).value
     def set_watcher_enabled(self, name, enable):
         """
         设置是否启用此 watcher
@@ -1414,11 +1414,13 @@ def put_secure(self, name, value):
 
 
 class ShellStub(BaseServiceStub):
-    def execute_script(self, script, alias=None):
+    def execute_script(self, script, alias=None,
+                                    timeout=60):
         """
         前台执行一段脚本（支持标准的多行脚本）
         """
-        req = protos.ShellRequest(name=alias, script=script)
+        req = protos.ShellRequest(name=alias, script=script,
+                                            timeout=timeout)
         r = self.stub.executeForeground(req)
         return r
     def execute_background_script(self, script, alias=None):
@@ -1676,15 +1678,9 @@ def acquire_lock(self, leaseTime=60):
         req = protos.Integer(value=leaseTime)
         r = self.stub.acquireLock(req)
         return r.value
-    def get_locking_session(self):
-        """
-        获取当前占有设备锁的会话ID
-        """
-        r = self.stub.getLockingSession(protos.Empty())
-        return r.value
     def get_session_token(self):
         """
-        获取当前占有设备锁的会话的令牌
+        获取当前会话的动态令牌
         """
         r = self.stub.getSessionToken(protos.Empty())
         return r.value
@@ -1827,6 +1823,10 @@ def frida(self):
             kwargs["certificate"] = self.certificate
         if self._get_session_token():
             kwargs["token"] = self._get_session_token()
+        try:
+            _frida_dma.remove_remote_device(self.server)
+        except frida.InvalidArgumentError:
+            """ No-op """
         device = _frida_dma.add_remote_device(self.server,
                                         **kwargs)
         return device
@@ -1933,8 +1933,9 @@ def stop_openvpn(self):
     def stop_gproxy(self):
         return self.stub("Proxy").stop_gproxy()
     # 快速调用: Shell
-    def execute_script(self, script, alias=None):
-        return self.stub("Shell").execute_script(script, alias=alias)
+    def execute_script(self, script, alias=None, timeout=60):
+        return self.stub("Shell").execute_script(script, alias=alias,
+                                                        timeout=timeout)
     def execute_background_script(self, script, alias=None):
         return self.stub("Shell").execute_background_script(script, alias=alias)
     def is_background_script_finished(self, tid):
@@ -2030,8 +2031,6 @@ def set_debug_log_enabled(self, enable):
     # 接口锁定
     def _get_session_token(self):
         return self.stub("Lock").get_session_token()
-    def _get_locking_session(self):
-        return self.stub("Lock").get_locking_session()
     def _acquire_lock(self, leaseTime=60):
         return self.stub("Lock").acquire_lock(leaseTime)
     def _refresh_lock(self, leaseTime=60):

lamda/exceptions.py

@@ -1,4 +1,4 @@
-# Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+# Copyright 2022 rev1si0n (https://github.com/rev1si0n). All rights reserved.
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/application.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/debug.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/file.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/policy.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/proxy.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/services.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
@@ -238,7 +238,6 @@ service File {
 
 service Lock {
     rpc releaseLock(google.protobuf.Empty) returns (Boolean) {}
-    rpc getLockingSession(google.protobuf.Empty) returns (String) {}
     rpc getSessionToken(google.protobuf.Empty) returns (String) {}
     rpc acquireLock(Integer) returns (Boolean) {}
     rpc refreshLock(Integer) returns (Boolean) {}

lamda/rpc/settings.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/shell.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
@@ -9,12 +9,13 @@ message ShellRequest {
     string tid        = 1;
     string name       = 2;
     string script     = 3;
+    int32  timeout    = 4;
 }
 
 message ShellResult {
     int32  exitstatus = 1;
-    string stdout     = 2;
-    string stderr     = 3;
+    bytes  stdout     = 2;
+    bytes  stderr     = 3;
 }
 
 message ShellTask {

lamda/rpc/status.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/storage.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/types.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/uiautomator.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/util.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/rpc/wifi.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+// Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 //
 // Distributed under MIT license.
 // See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

lamda/types.py

@@ -1,4 +1,4 @@
-# Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+# Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# Copyright 2022 rev1si0n (ihaven0emmail@gmail.com). All rights reserved.
+# Copyright 2022 rev1si0n (lamda.devel@gmail.com). All rights reserved.
 import setuptools
 
 exec(open("lamda/__init__.py", "rt").read())