From ebb4ef0346729822df0468606692a115b4e5b86b Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Tue, 26 Feb 2019 15:59:16 -0800 Subject: [PATCH] Rebranding. --- Remotely.sln | 4 ++-- Remotely_Agent/Program.cs | 4 ++-- .../Resources/Remotely_ScreenCapture.exe | Bin 1301504 -> 1301504 bytes .../{ClientSocket.cs => DeviceSocket.cs} | 2 +- Remotely_Agent/Services/WindowsService.cs | 2 +- Remotely_Server/Pages/Error.cshtml.cs | 2 +- Remotely_Server/Services/RCDeviceSocketHub.cs | 4 ---- .../wwwroot/scripts/ResultsParser.js | 4 ++-- .../wwwroot/scripts/ResultsParser.js.map | 2 +- .../wwwroot/scripts/ResultsParser.ts | 4 ++-- 10 files changed, 12 insertions(+), 16 deletions(-) rename Remotely_Agent/Services/{ClientSocket.cs => DeviceSocket.cs} (99%) diff --git a/Remotely.sln b/Remotely.sln index fbc1e0f5..e56a1109 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28606.126 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Agent", "Remotely_Agent\Remotely_Agent.csproj", "{98A8DF30-0993-4B49-822E-244A70AB8C4D}" ProjectSection(ProjectDependencies) = postProject diff --git a/Remotely_Agent/Program.cs b/Remotely_Agent/Program.cs index 42585536..66044bf0 100644 --- a/Remotely_Agent/Program.cs +++ b/Remotely_Agent/Program.cs @@ -44,14 +44,14 @@ namespace Remotely_Agent { #if DEBUG IsDebug = true; - ClientSocket.Connect(); + DeviceSocket.Connect(); #else ServiceBase.Run(new WindowsService()); #endif } else { - ClientSocket.Connect(); + DeviceSocket.Connect(); } while (true) diff --git a/Remotely_Agent/Resources/Remotely_ScreenCapture.exe b/Remotely_Agent/Resources/Remotely_ScreenCapture.exe index 2518b05f40516a8af15cbe5ba5e2888bf1362785..5b458b5072a496dbe61e967fd1da8278dc078b98 100644 GIT binary patch delta 2353 zcmZveeN0nV7{=e1QhKRaZ+mGi6lPnnq6MjfN}*!0e9TRU3 zbzjo4wK{cUQ#akrvWXdJ%(kG(f-@inH@E0ilHvZ?)GW>zXJqd=_xM4wCQo{Q=XuU~ z&%JNjdxBl%!LIVw?Xh#FYwm{MNZTa0)U372OzG!!x1w|Njyzgxho%KHd_a+QLv^1VB91Cn@0<`V(FVt=;ISgG!*MYfORndKakuVC6+UYx;EMR z5!SVRWvwzSCYwrH3$D?ZyTg*S0ytEgs^cZwo0!-~Xy=={s@}zVx{H|9(-{x%Vs|?vvo+Zrd`Dpi4_{Zq%PIVK z>aj=R9jy<;allq~^6+1eS3dvL|E(Mg$0?k~!?)G&5?Z-?+?Uj(hZ|{mqh+&w+h#kG zVn`ZNEJ;g>Bk4#IDW0S!jUpwGMw1MrF(jE}?A&ZOT^w$ba;YXNLst4Xo7tvWkDH+=hV=z6R&1->G z#V&&pgVBDwVjFXg4_-r7$c$3-UmEnDEMQ4>&@!UBWyC(m;x6Cg@%byHx zJj-b)eyVG&(TxLw03IicYAt?WKJQewxA2L(JE+5L4}-+4w2kp-fZ;XL_vGZuM_18s`7Nf6r3w) zwWmU!g55+^e<=Qwf{1Y{p5bOlI#IBnXh0?Y1I@wUY`z)H&8UMMTpm#AU7x{}gV#Al zq~SoBX&T<(6qZI6&m+3aDJ12kg-p}YQ_SXtq!OYTSj(shnx*yLR#P6Xy$7?Qk!LCtL3D5xyZOBCeP4D$nZ5WoZMJqbg+6#+c*tV*mE0nFhq zDfM5q1S_IOmtw;gqggKHlzR>LBCt2JIdLB5m9u#fNSg6Q;(QEp3c;{5+gyRWqP7Y2 z&#-&}i>QyXYQ(Rh3fFM21%85^<|=GalQ5il$Xt!@32G?&#k>gb3o=c=YhH|=g?vqD z&-Peez+;c7z*2()g5J-5&axEmPZBuJ*JxRWC#%@R2)ta@ZCQbP`RPL4+A3`9yfQ(l z2+M}DPh0%8S>+$PFSmTFKeD9Le_Z)}Ub|b|C`85mcYd6%_ENEQ6dSy-Jx{VuF*4Au@?(A3Qm@bJk u3+3PeyS9fN77d+b=&;jiIJOO delta 2340 zcmZA3drVVT90%~<15La*#G!BPmj+vQZ+_C{t zD@Lc*ZtZ-K86Q!nTa1`dr`f~#m_|`HUo)FJX3%7F@`r9@(Xrn-J&qvBkM?uFzkANP zJ(PQ!L$jJgvo^Oz{MhiJ{v%<>(mioNkrfl6RMaqvjvvnnx`IEW#pQ;-+5{-9*| z=i(^L^|xS?Rqj=I?+f%>1sb>zuRzUJ05$0xK;)@*t14PCouN1ZK(BiDoC+dzkr^tx z%D%{7WDLy!K$#5@1zWa)Ih7bW1|ZR)0o2edKj{)bsZ`A;VXeSdWFMM$9Rc#*Qqix| zDrg^TI*+LJKOOc7F7daSJ@Pz?X%*%ym0go}8=xKI7b0%-*Cp)9prH6g76VjMnW!45 zXmVhypcm++fvxmT@6Sn8G#4WPuCz}}T#u$M3N3tTcLuJf!GAyLlz+NKXWPCD64)5* zD!!#wD{s9w&|2%il6;i6uHW*kH4@mUHs1PRptZq&c=+?9M!<1uP2sJN23o8AJ4Sr& zKa?z~)@)eiv8?r2kV-|Rri!4_P(@NjQAt!S zOXNiSROpCvI;mY~$J7uc;qg4d_Nf(e5}p#OP3~4F;{~C{f!iH@F`n; z4?h@?_Bxl#Bk%#2PdegUNqQ`@6}D#Cf=@)Y*5)NeOlDUWkZO~E)>tuGs4@9ENfBCP z)9Y-Qz~z$~Y;7c)$fic=btyQyNraxLHe!wl10(giRLm3E?vZVzB9X1g{XiaxWg_$D z`bo1yR^{3zr=dq=OIP$>1 z1~$J}8lBlmOcAYz9Np?Hv(_X{fIY%CR>>x}Q{9XL~HyKxPv zTFB!FK@KhxTH>gXbFha*^Y>_X6$JES@lPIlr7sJ1llsD+$rR!}k+E%>j1Ps_HciGpA+{Ao2vgZ&dbDgS ziZDiqZACGrhE=0wdr^!&POs#2cdMu1R-rO?Cut8?3zWO-!HwUuTO#!Et#IRIy3aAO zt#D%%zwfaBmGw}HZwDWYR1&czs7+J8Yue1S0PM(UiJOTvv)Fk7h@W^ct{nGpd7YT#8Rz00p`F%QKzY0t>*eCQ+_DiN(w0Oejjc~0r&Br@j0eG$Kq-i03 zQ#G)(I&6D|DF6#Hv!D(EI?j($rugLOReKM2KRz&H@4+{#jb}D})sb{e`D2)oJ*lvM zx-UZ`)dG4ZSrAO_QWDMAx)hjQSyI_rcksjRjc3cg{{7g}l=yZvkc diff --git a/Remotely_Agent/Services/ClientSocket.cs b/Remotely_Agent/Services/DeviceSocket.cs similarity index 99% rename from Remotely_Agent/Services/ClientSocket.cs rename to Remotely_Agent/Services/DeviceSocket.cs index b6fe3868..e64a3347 100644 --- a/Remotely_Agent/Services/ClientSocket.cs +++ b/Remotely_Agent/Services/DeviceSocket.cs @@ -18,7 +18,7 @@ using System.Reflection; namespace Remotely_Agent.Services { - public static class ClientSocket + public static class DeviceSocket { public static Timer HeartbeatTimer { get; private set; } public static bool IsServerVerified { get; set; } diff --git a/Remotely_Agent/Services/WindowsService.cs b/Remotely_Agent/Services/WindowsService.cs index 2b028ddc..46b8d918 100644 --- a/Remotely_Agent/Services/WindowsService.cs +++ b/Remotely_Agent/Services/WindowsService.cs @@ -29,7 +29,7 @@ namespace Remotely_Agent.Services var subkey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", true); subkey.SetValue("SoftwareSASGeneration", "3", Microsoft.Win32.RegistryValueKind.DWord); } - ClientSocket.Connect(); + DeviceSocket.Connect(); } catch (Exception ex) { diff --git a/Remotely_Server/Pages/Error.cshtml.cs b/Remotely_Server/Pages/Error.cshtml.cs index 49e1dca8..f90e4114 100644 --- a/Remotely_Server/Pages/Error.cshtml.cs +++ b/Remotely_Server/Pages/Error.cshtml.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Remotely_Server.Pages { + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public class ErrorModel : PageModel { public ErrorModel(DataService dataService) @@ -23,7 +24,6 @@ namespace Remotely_Server.Pages private DataService DataService { get; } - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public void OnGet() { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; diff --git a/Remotely_Server/Services/RCDeviceSocketHub.cs b/Remotely_Server/Services/RCDeviceSocketHub.cs index 50490941..e2ad801e 100644 --- a/Remotely_Server/Services/RCDeviceSocketHub.cs +++ b/Remotely_Server/Services/RCDeviceSocketHub.cs @@ -103,10 +103,6 @@ namespace Remotely_Server.Services { await RCBrowserHub.Clients.Client(rcBrowserConnectionID).SendAsync("DesktopSwitchFailed"); } - public async Task GetIceConfiguration() - { - //await Clients.Caller.SendAsync("IceConfiguration", AppConfig.IceConfiguration); - } public async Task GetSessionID() { var random = new Random(); diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js b/Remotely_Server/wwwroot/scripts/ResultsParser.js index 9aa7f403..ff7c571b 100644 --- a/Remotely_Server/wwwroot/scripts/ResultsParser.js +++ b/Remotely_Server/wwwroot/scripts/ResultsParser.js @@ -1,7 +1,7 @@ import * as DataGrid from "./DataGrid.js"; import { TabContentWrapper } from "./UI.js"; export function CreateCommandHarness(context) { - var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse in"; + var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; var commandHarness = document.createElement("div"); commandHarness.id = context.ID; commandHarness.classList.add("command-harness"); @@ -23,7 +23,7 @@ export function AddPSCoreResultsHarness(result) { var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName; var resultsWrapper = document.getElementById(result.CommandContextID + "-results"); var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText); - var collapseClass = totalDevices > 1 ? "collapse" : "collapse in"; + var collapseClass = totalDevices > 1 ? "collapse" : "collapse show"; var resultDiv = document.createElement("div"); resultDiv.innerHTML = `
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js.map b/Remotely_Server/wwwroot/scripts/ResultsParser.js.map index 38db2b9e..bf884700 100644 --- a/Remotely_Server/wwwroot/scripts/ResultsParser.js.map +++ b/Remotely_Server/wwwroot/scripts/ResultsParser.js.map @@ -1 +1 @@ -{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.ts b/Remotely_Server/wwwroot/scripts/ResultsParser.ts index 72a98df1..4025b430 100644 --- a/Remotely_Server/wwwroot/scripts/ResultsParser.ts +++ b/Remotely_Server/wwwroot/scripts/ResultsParser.ts @@ -5,7 +5,7 @@ import { GenericCommandResult } from "./Models/GenericCommandResult.js"; import { ConsoleOutputDiv, TabContentWrapper } from "./UI.js"; export function CreateCommandHarness(context: CommandContext): HTMLDivElement { - var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse in"; + var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; var commandHarness = document.createElement("div"); commandHarness.id = context.ID; commandHarness.classList.add("command-harness"); @@ -28,7 +28,7 @@ export function AddPSCoreResultsHarness(result: PSCoreCommandResult) { var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName; var resultsWrapper = document.getElementById(result.CommandContextID + "-results"); var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText); - var collapseClass = totalDevices > 1 ? "collapse" : "collapse in"; + var collapseClass = totalDevices > 1 ? "collapse" : "collapse show"; var resultDiv = document.createElement("div"); resultDiv.innerHTML = `