Merge pull request #458 from midoks/dev

SSH禁止密码登陆优化

README.md

@@ -109,6 +109,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 * MySQL/MYSQL-YUM/MySQL-APT添加重置master功能。
 * 支持华为欧拉系统。
 * 支持rar解压。
+* SSH禁止密码登陆优化。
 
 ### JSDelivr安装地址
 

class/core/firewall_api.py

@@ -214,16 +214,13 @@ class firewall_api:
 
         data['pass_prohibit_status'] = False
         # 密码登陆配置检查
-        pass_rep = "#PasswordAuthentication\s+(\w*)\s*\n"
+        pass_rep = "PasswordAuthentication\s+(\w*)\s*\n"
         pass_status = re.search(pass_rep, conf)
         if pass_status:
-            data['pass_prohibit_status'] = True
-
-        if not data['pass_prohibit_status']:
-            pass_rep = "PasswordAuthentication\s+(\w*)\s*\n"
-            pass_status = re.search(pass_rep, conf)
             if pass_status and pass_status.groups(0)[0].strip() == 'no':
                 data['pass_prohibit_status'] = True
+        else:
+            data['pass_prohibit_status'] = True
 
         data['port'] = port
         data['status'] = status
@@ -299,11 +296,17 @@ class firewall_api:
 
         conf = mw.readFile(file)
 
-        if status == '1':
+        pass_rep = "PasswordAuthentication\s+(\w*)\s*\n"
+        pass_status = re.search(pass_rep, conf)
+        if not pass_status:
             rep = "(#)?PasswordAuthentication\s+(\w*)\s*\n"
             conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
+
+        if status == '1':
+            rep = "PasswordAuthentication\s+(\w*)\s*\n"
+            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
         else:
-            rep = "(#)?PasswordAuthentication\s+(\w*)\s*\n"
+            rep = "PasswordAuthentication\s+(\w*)\s*\n"
             conf = re.sub(rep, "PasswordAuthentication no\n", conf)
         mw.writeFile(file, conf)
         mw.execShell("systemctl restart sshd.service")

class/core/system_api.py

@@ -273,10 +273,26 @@ class system_api:
             title = mw.readFile(titlePl).strip()
         return title
 
+    def getSystemDeviceTemperature(self):
+        if not hasattr(psutil, "sensors_temperatures"):
+            return False, "platform not supported"
+        temps = psutil.sensors_temperatures()
+        if not temps:
+            return False, "can't read any temperature"
+        for name, entries in temps.items():
+            for entry in entries:
+                return True, entry.label
+                # print("%-20s %s °C (high = %s °C, critical = %s °C)" % (
+                #     entry.label or name, entry.current, entry.high,
+                #     entry.critical))
+        return False, ""
+
     def getSystemVersion(self):
         #
         # 取操作系统版本
         current_os = mw.getOs()
+        # sys_temper = self.getSystemDeviceTemperature()
+        # print(sys_temper)
         # mac
         if current_os == 'darwin':
             data = mw.execShell('sw_vers')[0]