From a86a5b1e6b751ef81282a5bf90f03de09d64d4b2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 14 Feb 2025 02:09:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=D0=B1=D0=B5=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=81=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=81=D1=82=D0=BE=D1=80=D0=BE=D0=BD=D0=B5=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0.=20=D0=A3=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D0=BE=D1=80=D0=BE=D0=BD=D0=B5=20=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   3 +
 src/_VisualDVM/Constants.java                 |   1 +
 .../Repository/Component/Visualiser.java      |   4 +-
 .../Repository/RepositoryServer.java          | 102 +++++++++++-------
 .../Repository/Server/ComponentsServer.java   |  12 ++-
 .../Server/SafeServerExchangeUnit.java        |  19 ++++
 .../Repository/Server/ServerRequestUnit.java  |  11 --
 .../TestingSystem/Common/TestingServer.java   |   2 +-
 8 files changed, 96 insertions(+), 58 deletions(-)
 create mode 100644 src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java
 delete mode 100644 src/_VisualDVM/Repository/Server/ServerRequestUnit.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 395d0d0e..b0fe59dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,11 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerRequestUnit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 3774a211..254fec26 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,6 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
+    public static final int version = 1165;
     public static final int planner_version = 6;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 355c3ea7..c1aa7cb2 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -3,7 +3,7 @@ import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Repository.Server.ServerRequestUnit;
+import _VisualDVM.Repository.Server.SaveServerExchangeUnit;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,7 +63,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = ServerRequestUnit.version;
+        version = SaveServerExchangeUnit.version;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/RepositoryServer.java
index e13bf1f0..6454457f 100644
--- a/src/_VisualDVM/Repository/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/RepositoryServer.java
@@ -2,11 +2,13 @@ package _VisualDVM.Repository;
 import Common.Database.Database;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
+import Common.Database.RepositoryRefuseException;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Passes.Server.RepositoryPass;
 import _VisualDVM.Repository.Server.DiagnosticSignalHandler;
+import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
@@ -81,7 +83,8 @@ public abstract class RepositoryServer<D extends Database> {
     }
     //-DVMTestingChecker
     public abstract int getPort();
-    protected abstract void SafeSession() throws Exception;
+    protected void Session() throws Exception {};
+    protected void UnsafeSession() throws Exception {}
     protected void startAdditionalThreads() {
     }
     public void ActivateDB() {
@@ -181,50 +184,67 @@ public abstract class RepositoryServer<D extends Database> {
                 Print("Ожидание команды от клиента...");
                 Object transport = in.readObject();
                 Print("Команда прочитана.");
+                //-->
                 if (transport instanceof ServerExchangeUnit_2021) {
                     request = (ServerExchangeUnit_2021) transport;
-                    response = null;
-                    Print("клиент_2021: <- " + (request.codeName));
+                    response = new ServerExchangeUnit_2021(ServerCode.OK);
+                    Print("клиент: <- " + (request.codeName));
+                    //--
                     try {
                         code = request.getCode();
-                        response = new ServerExchangeUnit_2021(ServerCode.OK);
-                        switch (code) {
-                            case Ping:
-                                Ping();
-                                break;
-                            case ReceiveFile:
-                                ReceiveFile();
-                                break;
-                            case Email:
-                                Email();
-                                break;
-                            case EditObject:
-                                EditObject();
-                                break;
-                            case GetObjectCopyByPK:
-                                GetObjectCopyByPK();
-                                break;
-                            case GetObjectsCopiesByPK:
-                                GetObjectsCopiesByPK();
-                                break;
-                            case PublishObject:
-                                PublishObject();
-                                break;
-                            case PublishObjects:
-                                PublishObjects();
-                                break;
-                            case DeleteObjectByPK:
-                                DeleteObjectByPK();
-                                break;
-                            case DeleteObjectsByPK:
-                                DeleteObjectsByPK();
-                                break;
-                            case CloneObjectByPK:
-                                CloneObject();
-                                break;
-                            default:
-                                SafeSession();
-                                break;
+                        //--
+                        if (transport instanceof SafeServerExchangeUnit){
+                            SafeServerExchangeUnit safe_request= (SafeServerExchangeUnit) transport;
+                            if (safe_request.version!=Constants.version){
+                                //версия не совпала. не даем работать.
+                                throw new RepositoryRefuseException("Версия клиента не совпадает с версией сервера!");
+                            }
+                            //БЕЗОПАСНАЯ СЕССИЯ
+                            switch (code) {
+                                case EditObject:
+                                    EditObject();
+                                    break;
+                                case GetObjectCopyByPK:
+                                    GetObjectCopyByPK();
+                                    break;
+                                case GetObjectsCopiesByPK:
+                                    GetObjectsCopiesByPK();
+                                    break;
+                                case PublishObject:
+                                    PublishObject();
+                                    break;
+                                case PublishObjects:
+                                    PublishObjects();
+                                    break;
+                                case DeleteObjectByPK:
+                                    DeleteObjectByPK();
+                                    break;
+                                case DeleteObjectsByPK:
+                                    DeleteObjectsByPK();
+                                    break;
+                                case CloneObjectByPK:
+                                    CloneObject();
+                                    break;
+                                default:
+                                    Session();
+                                    break;
+                            }
+                        }else {
+                            //ОПАСНАЯ СЕССИЯ
+                            switch (code){
+                                case Ping:
+                                    Ping();
+                                    break;
+                                case ReceiveFile:
+                                    ReceiveFile();
+                                    break;
+                                case Email:
+                                    Email();
+                                    break;
+                                default:
+                                    UnsafeSession();
+                                    break;
+                            }
                         }
                     } catch (Exception ex) {
                         response = new ServerExchangeUnit_2021(ServerCode.FAIL, "Исключение сервера", ex);
diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java
index ca6e3e0c..1e61c5d1 100644
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -330,9 +330,8 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     }
     //--
     @Override
-    protected void SafeSession() throws Exception {
+    protected void UnsafeSession() throws Exception {
         switch (code) {
-// ПРОХОДЫ НЕЗАВИСИМЫЕ ОТ ВЕРСИИ
             case CheckSubscriberRole:
                 CheckSubscriberRole();
                 break;
@@ -340,6 +339,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 GetComponentsBackUps();
                 break;
             case UpdateComponent:
+                //возможно со стороны админа ввод подтверждения по почте запрашивать.
                 PublishComponent();
                 break;
             case ReceiveComponent:
@@ -354,7 +354,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             case GetComponentChangesLog:
                 GetComponentChangesLog();
                 break;
-//------------------------------------------------------------------------>>>>
+            default:
+                throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
+        }
+    }
+    @Override
+    protected void Session() throws Exception {
+        switch (code) {
             case ReceiveAllArchives:
                 ReceiveAllArchives();
                 break;
diff --git a/src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java b/src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java
new file mode 100644
index 00000000..c2b990e6
--- /dev/null
+++ b/src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java
@@ -0,0 +1,19 @@
+package _VisualDVM.Repository.Server;
+import _VisualDVM.Constants;
+
+import java.io.Serializable;
+public class SafeServerExchangeUnit extends ServerExchangeUnit_2021 {
+    public int version;
+    public SafeServerExchangeUnit(ServerCode code_in, String arg_in, Serializable object_in) {
+        super(code_in, arg_in, object_in);
+        version = Constants.version;
+    }
+    public SafeServerExchangeUnit(ServerCode code_in, String arg_in) {
+        super(code_in, arg_in);
+        version = Constants.version;
+    }
+    public SafeServerExchangeUnit(ServerCode code_in) {
+        super(code_in);
+        version = Constants.version;
+    }
+}
diff --git a/src/_VisualDVM/Repository/Server/ServerRequestUnit.java b/src/_VisualDVM/Repository/Server/ServerRequestUnit.java
deleted file mode 100644
index 15faf429..00000000
--- a/src/_VisualDVM/Repository/Server/ServerRequestUnit.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package _VisualDVM.Repository.Server;
-import java.io.Serializable;
-public class ServerRequestUnit {
-    public static final int version = 1165;
-    //--------------------------------------------
-    public String codeName;
-    public String arg;
-    public Serializable object;
-    //--------------------------------------------
-
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 255c9464..e3f8b678 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -762,7 +762,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     //--
     @Override
-    protected void SafeSession() throws Exception {
+    protected void Session() throws Exception {
         switch (code) {
             case PerformAutoSapforTesting:
                 PerformAutoSapforTesting();