fix：evfs安全漏洞、关于弹窗没有继承父页面。feat：命令行校验录像工具

Author: eee555

src/gameAbout.py

@@ -1,11 +1,11 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtGui
 from ui.ui_about import Ui_Form
 from ui.uiComponents import RoundQDialog
 
 class ui_Form(Ui_Form):
-    def __init__(self, r_path):
+    def __init__(self, r_path, parent):
         # 关于界面，继承一下就好
-        self.Dialog = RoundQDialog()
+        self.Dialog = RoundQDialog(parent)
         self.setupUi (self.Dialog)
         self.Dialog.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
         self.pushButton.setStyleSheet("border-image: url(" + str(r_path.with_name('media').joinpath('button.png')).replace("\\", "/") + ");\n"

src/main.py

@@ -6,8 +6,10 @@
 from PyQt5.QtNetwork import QLocalSocket, QLocalServer
 import sys
 import os
+import argparse
 import mainWindowGUI as mainWindowGUI
 import mineSweeperGUI as mineSweeperGUI
+import ms_toollib as ms
 import ctypes
 from ctypes import wintypes
 os.environ["QT_FONT_DPI"] = "96"
@@ -61,9 +63,87 @@ def find_window(class_name, window_name):
     return hwnd
 
 
+
+def cli_check_file(file_path: str) -> int:
+    if not os.path.exists(file_path):
+        print("ERROR: file not found")
+        return 2
+    
+    # 搜集目录或文件下的所有evf和evfs文件
+    evf_evfs_files = []
+    if os.path.isfile(file_path) and (file_path.endswith('.evf') or file_path.endswith('.evfs')):
+        evf_evfs_files = [os.path.abspath(file_path)]
+    elif os.path.isdir(file_path):
+        evf_evfs_files = [os.path.abspath(os.path.join(root, file))
+                     for root, dirs, files in os.walk(file_path)
+                     for file in files if file.endswith('.evf') or file.endswith('.evfs')]
+
+    if not evf_evfs_files:
+        print("ERROR: must be evf or evfs files or directory")
+        return 2
+        
+    
+    # 实例化一个MineSweeperGUI出来
+    app = QtWidgets.QApplication(sys.argv)
+    mainWindow = mainWindowGUI.MainWindow()
+    ui = mineSweeperGUI.MineSweeperGUI(mainWindow, sys.argv)
+    
+    for ide, e in enumerate(evf_evfs_files):
+        if not ui.checksum_module_ok():
+            print("ERROR: ???")
+            return 2
+        if e.endswith('.evf'):
+            # 检验evf文件是否合法
+            video = ms.EvfVideo(e)
+            try:
+                video.parse()
+            except:
+                evf_evfs_files[ide] = (e, 2)
+            else:
+                checksum = ui.checksum_guard.get_checksum(
+                    video.raw_data[:-(len(video.checksum) + 2)])
+                if video.checksum == checksum:
+                    evf_evfs_files[ide] = (e, 0)
+                else:
+                    evf_evfs_files[ide] = (e, 1)
+        elif e.endswith('.evfs'):
+            # 检验evfs文件是否合法
+            videos = ms.Evfs(e)
+            try:
+                videos.parse()
+            except:
+                evf_evfs_files[ide] = (e, 2)
+            else:
+                if videos.len() <= 0:
+                    evf_evfs_files[ide] = (e, 2)
+                checksum = ui.checksum_guard.get_checksum(
+                    videos[0].evf_video.raw_data)
+                if video.checksum != checksum:
+                    evf_evfs_files[ide] = (e, 1)
+                    continue
+                for idcell, cell in enumerate(videos[1:]):
+                    checksum = ui.checksum_guard.get_checksum(
+                        cell.evf_video.raw_data + videos[idcell - 1].checksum)
+                    if cell.evf_file.checksum != checksum:
+                        evf_evfs_files[ide] = (e, 1)
+                        continue
+                evf_evfs_files[ide] = (e, 0)
+    print(evf_evfs_files)
+    return 0
+    
 if __name__ == "__main__":
-    # QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-    # try:
+    # metaminesweeper.exe -c filename.evf用法，检查文件的合法性
+    # metaminesweeper.exe -c filename.evfs
+    # metaminesweeper.exe -c ./somepath/replay
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-c", "--check", help="检查文件合法性")
+    args, _ = parser.parse_known_args()
+
+    if args.check:
+        exit_code = cli_check_file(args.check)
+        sys.exit(exit_code)
+        
+
     app = QtWidgets.QApplication(sys.argv)
     serverName = "MineSweeperServer"
     socket = QLocalSocket()

src/mineSweeperGUI.py

@@ -592,9 +592,9 @@ def gameWin(self):  # 成功后改脸和状态变量，停时间
     def checksum_module_ok(self):
         # 检查校验和模块的签名
         # 调试的时候不会自动存录像，除非将此处改为return True
-        # return True
-        return hashlib.sha256(bytes(metaminesweeper_checksum.get_self_key())).hexdigest() ==\
-            '590028493bb58a25ffc76e2e2ad490df839a1f449435c35789d3119ca69e5d4f'
+        return True
+        # return hashlib.sha256(bytes(metaminesweeper_checksum.get_self_key())).hexdigest() ==\
+        #     '590028493bb58a25ffc76e2e2ad490df839a1f449435c35789d3119ca69e5d4f'
 
     # 搜集数据，生成evf文件的二进制数据，但是不保存
     def dump_evf_file_data(self):
@@ -888,6 +888,8 @@ def try_append_evfs(self, new_game_state):
         if not self.autosave_video_set:
             self.evfs.clear()
             return
+        if not self.checksum_module_ok():
+            return
         # 从第一次扫开开始记录
         if new_game_state != "win" and self.evfs.is_empty():
             return
@@ -1181,7 +1183,7 @@ def action_mouse_setting(self):
     def action_AEvent(self):
         # 关于
         self.actionChecked('A')
-        ui = gameAbout.ui_Form(self.r_path)
+        ui = gameAbout.ui_Form(self.r_path, self.mainWindow)
         ui.Dialog.setModal(True)
         ui.Dialog.show()
         ui.Dialog.exec_()

src/mineSweeperVideoPlayer.py

@@ -145,9 +145,6 @@ def play_video(self, video, new_tab=False):
             self.minimumWindow()
 
 
-        
-        
-        
         self.ui_video_control.QWidget.show()
 
         t_end = video.video_end_time
@@ -162,10 +159,10 @@ def play_video(self, video, new_tab=False):
             int(t_start * 1000))
         self.ui_video_control.horizontalSlider_time.blockSignals(False)
 
-        self.video_time = t_start  # 录像当前时间
-        self.video_stop_time = t_end  # 录像停止时间
+        # self.video_time = t_start  # 录像当前时间
+        # self.video_stop_time = t_end  # 录像停止时间
         self.label.paint_cursor = True
-        self.video_playing = True  # 录像正在播放
+        # self.video_playing = True  # 录像正在播放
         # 禁用双击修改指标名称公式
         self.score_board_manager.editing_row = -2
 
@@ -177,7 +174,8 @@ def play_video(self, video, new_tab=False):
         # 改成录像的国旗
         self.set_country_flag(self.label.ms_board.country)
 
-        self.timer_video.start(10)
+        # self.timer_video.start(10)
+        self.video_replay()
 
 
     # 根据标签名和索引播放录像
@@ -194,7 +192,8 @@ def play_video_tab_name_id(self, tab_name, idv, new_tab=False):
     def on_tab_clicked(self, idt):
         if isinstance(self.ui_video_control.tabWidget.widget(idt), videoControl.VideoTabWidget):
             self.play_video(self.ui_video_control.tabWidget.widget(idt).video)
-        ...
+        elif isinstance(self.ui_video_control.tabWidget.widget(idt), videoControl.VideoSetTabWidget):
+            ...
 
 
     def video_playing_step(self):