From 74df89fafdc1cd2ed9f1b99fe54e926eb38c80a3 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 9 Sep 2020 15:54:02 +0300
Subject: Added firewall exception to FSE installer. Added new permission
 FSE_Run Procedure Project File.

---
 .../Advanced Installer Projects/FSE Installer.aip  | 27 ++++++++++++++++------
 .../ViewModels/ProcedureRunnerViewVM.cs            |  7 ++++++
 .../Tango.BL/Enumerations/Permissions.cs           |  6 +++++
 3 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
index 2e7633b3f..f8e32a2d0 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip	
@@ -64,6 +64,7 @@
     <ROW Component="ColorMine.dll" ComponentId="{2A12535E-52C6-4B4F-9428-6CFB916E8EEF}" Directory_="APPDIR" Attributes="0" KeyPath="ColorMine.dll"/>
     <ROW Component="ControlzEx.dll" ComponentId="{9F73B283-098E-4615-8608-2BAFB9347E87}" Directory_="APPDIR" Attributes="0" KeyPath="ControlzEx.dll"/>
     <ROW Component="D17D1EE3B5447079AEF0A1CF58498F1" ComponentId="{8E526DB3-B68B-4DBF-B262-BF34E040418E}" Directory_="APPDIR" Attributes="4" KeyPath="D17D1EE3B5447079AEF0A1CF58498F1" Options="2"/>
+    <ROW Component="DeviceId.dll" ComponentId="{95686F7C-16B2-46F2-8AF2-E2B3A85ED7AD}" Directory_="APPDIR" Attributes="0" KeyPath="DeviceId.dll"/>
     <ROW Component="DocumentFormat.OpenXml.dll" ComponentId="{E7207B67-8A21-4397-AF76-C8A7A8B368AA}" Directory_="APPDIR" Attributes="0" KeyPath="DocumentFormat.OpenXml.dll"/>
     <ROW Component="Dragablz.dll" ComponentId="{2C3F62AE-8C15-4498-B807-CA65F53F5428}" Directory_="APPDIR" Attributes="0" KeyPath="Dragablz.dll"/>
     <ROW Component="Dragablz.xml" ComponentId="{5279E3B5-D3D3-4751-AA31-081CABF51875}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.dll.config" Type="0"/>
@@ -377,9 +378,10 @@
     <ROW Component="vcruntime140d.dll" ComponentId="{AF42196B-67BB-4EBA-8C3A-38B9527F9775}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="D17D1EE3B5447079AEF0A1CF58498F1" Title="SQL Server Express LocalDB 2017 (required for remote upgrade)" Description="SQL Server Express LocalDB 2017 (required for TUP package generation)" Display="3" Level="1" Attributes="0"/>
-    <ROW Feature="ResetDiagnosticsSettings" Title="Reset My Diagnostics Settings" Description="Reset the diagnostics user settings." Display="5" Level="4" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="TangoFSE" Title="Tango FSE" Description="Tango FSE" Display="1" Level="1" Directory_="APPDIR" Attributes="16"/>
+    <ROW Feature="AddFirewallException" Title="Add Firewall Exception" Description="Adds a firewall exception for Tango FSE" Display="7" Level="1" Directory_="APPDIR" Attributes="0"/>
+    <ROW Feature="D17D1EE3B5447079AEF0A1CF58498F1" Title="SQL Server Express LocalDB 2017 (required for remote upgrade)" Description="SQL Server Express LocalDB 2017 (required for TUP package generation)" Display="5" Level="1" Attributes="0"/>
+    <ROW Feature="ResetDiagnosticsSettings" Title="Reset My Diagnostics Settings" Description="Reset the diagnostics user settings." Display="9" Level="4" Directory_="APPDIR" Attributes="0"/>
+    <ROW Feature="TangoFSE" Title="Tango FSE" Description="Tango FSE" Display="3" Level="1" Directory_="APPDIR" Attributes="16"/>
     <ATTRIBUTE name="CurrentFeature" value="TangoFSE"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -754,6 +756,7 @@
     <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
     <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
     <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
+    <ROW File="DeviceId.dll" Component_="DeviceId.dll" FileName="DeviceId.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\DeviceId.dll" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -812,6 +815,7 @@
     <ROW Action="AI_InstallPostPrerequisite" Description="Installing prerequisite software" DescriptionLocId="ActionText.Description.AI_InstallPrerequisite" Template="Installing [1]{[2] completed}" TemplateLocId="ActionText.Template.AI_InstallPrerequisite"/>
     <ROW Action="AI_InstallPrerequisite" Description="Installing prerequisite software" DescriptionLocId="ActionText.Description.AI_InstallPrerequisite" Template="Installing [1]{[2] completed}" TemplateLocId="ActionText.Template.AI_InstallPrerequisite"/>
     <ROW Action="AI_VerifyPrereq" Description="Verifying prerequisites" DescriptionLocId="ActionText.Description.AI_VerifyPrereq" Template="[1] was not installed correctly." TemplateLocId="ActionText.Template.AI_VerifyPrereq"/>
+    <ROW Action="AddFirewallException" Description="Adding firewall exception"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiAppSearchComponent">
     <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_LM" Builds="DefaultBuild"/>
@@ -879,6 +883,8 @@
     <ROW Action="AI_DATA_SETTER" Type="51" Source="AI_ExtractFiles" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="AEkAcwA2ADQAQgBpAHQAAgABAEkAcwBGAGEAbABsAGIAYQBjAGsAMwAyAEIAaQB0AAIAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAAgAjACAAQgBsAG8AYwBrACAAZgBvAHIAIABkAGUAYwBsAGEAcgBpAG4AZwAgAHQAaABlACAAcwBjAHIAaQBwAHQAIABwAGEAcgBhAG0AZQB0AGUAcgBzAC4ADQAKAFAAYQByAGEAbQAoACkADQAKAA0ACgAjACAAWQBvAHUAcgAgAGMAbwBkAGUAIABnAG8AZQBzACAAaABlAHIAZQAuAA0ACgAkAGYAbwBsAGQAZQByACAAPQAgACQAZQBuAHYAOgBBAFAAUABEAEEAVABBACAAKwAgACIAXABUAHcAaQBuAGUAXABUAGEAbgBnAG8AXABDAGEAYwBoAGUAXABUAGEAbgBnAG8AIABGAFMARQAiAA0ACgBSAGUAbQBvAHYAZQAtAEkAdABlAG0AIAAtAEwAaQB0AGUAcgBhAGwAUABhAHQAaAAgACQAZgBvAGwAZABlAHIAIAAtAEYAbwByAGMAZQAgAC0AUgBlAGMAdQByAHMAZQ=="/>
     <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="AEkAcwA2ADQAQgBpAHQAAgABAEkAcwBGAGEAbABsAGIAYQBjAGsAMwAyAEIAaQB0AAIAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAAgAjACAAQgBsAG8AYwBrACAAZgBvAHIAIABkAGUAYwBsAGEAcgBpAG4AZwAgAHQAaABlACAAcwBjAHIAaQBwAHQAIABwAGEAcgBhAG0AZQB0AGUAcgBzAC4ADQAKAFAAYQByAGEAbQAoACkADQAKAA0ACgAjACAAWQBvAHUAcgAgAGMAbwBkAGUAIABnAG8AZQBzACAAaABlAHIAZQAuAA0ACgAkAGQAaQBhAGcAbgBvAHMAdABpAGMAcwBGAGkAbABlACAAPQAgACQAZQBuAHYAOgBBAFAAUABEAEEAVABBACAAKwAgACIAXABUAHcAaQBuAGUAXABUAGEAbgBnAG8AXABEAGkAYQBnAG4AbwBzAHQAaQBjAHMAXABUAGEAbgBnAG8ALgBGAFMARQAuAFUASQAuAFUAcwBlAHIALgBqAHMAbwBuACIADQAKAFIAZQBtAG8AdgBlAC0ASQB0AGUAbQAgAC0ATABpAHQAZQByAGEAbABQAGEAdABoACAAJABkAGkAYQBnAG4AbwBzAHQAaQBjAHMARgBpAGwAZQAgAC0ARgBvAHIAYwBl"/>
+    <ROW Action="AI_DATA_SETTER_3" Type="51" Source="AddFirewallException" Target="AEkAcwA2ADQAQgBpAHQAAgABAEkAcwBGAGEAbABsAGIAYQBjAGsAMwAyAEIAaQB0AAIAAQBQAGEAcgBhAG0AcwACACIAWwAjAFQAYQBuAGcAbwAuAEYAUwBFAC4AVQBJAC4AZQB4AGUAXQAiAAEAUwBjAHIAaQBwAHQAAgAjACAAQgBsAG8AYwBrACAAZgBvAHIAIABkAGUAYwBsAGEAcgBpAG4AZwAgAHQAaABlACAAcwBjAHIAaQBwAHQAIABwAGEAcgBhAG0AZQB0AGUAcgBzAC4ADQAKAFAAYQByAGEAbQAoACQAZgBzAGUAUABhAHQAaAApAA0ACgANAAoAIwAgAFIAZQBtAG8AdgBlACAAZQB4AGkAcwB0AGkAbgBnACAAcgB1AGwAZQAuAA0ACgB0AHIAeQANAAoAWwBcAHsAXQANAAoAUgBlAG0AbwB2AGUALQBOAGUAdABGAGkAcgBlAHcAYQBsAGwAUgB1AGwAZQAgAC0ARABpAHMAcABsAGEAeQBOAGEAbQBlACAAIgBUAGEAbgBnAG8AIABGAFMARQAiAA0ACgBbAFwAfQBdAA0ACgBjAGEAdABjAGgAIABbAFwAewBdAFsAXAB9AF0ADQAKAA0ACgAjACAAQQBkAGQAIABuAGUAdwAgAHIAdQBsAGUADQAKAG4AZQB0AHMAaAAgAGEAZAB2AGYAaQByAGUAdwBhAGwAbAAgAGYAaQByAGUAdwBhAGwAbAAgAGEAZABkACAAcgB1AGwAZQAgAG4AYQBtAGUAPQAiAFQAYQBuAGcAbwAgAEYAUwBFACIAIABkAGkAcgA9AGkAbgAgAGEAYwB0AGkAbwBuAD0AYQBsAGwAbwB3ACAAcAByAG8AZwByAGEAbQA9ACQAZgBzAGUAUABhAHQAaAAgAGUAbgBhAGIAbABlAD0AeQBlAHM="/>
+    <ROW Action="AI_DATA_SETTER_4" Type="51" Source="RemoveFirewallException" Target="AEkAcwA2ADQAQgBpAHQAAgABAEkAcwBGAGEAbABsAGIAYQBjAGsAMwAyAEIAaQB0AAIAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAAgAjACAAQgBsAG8AYwBrACAAZgBvAHIAIABkAGUAYwBsAGEAcgBpAG4AZwAgAHQAaABlACAAcwBjAHIAaQBwAHQAIABwAGEAcgBhAG0AZQB0AGUAcgBzAC4ADQAKAFAAYQByAGEAbQAoACkADQAKAA0ACgAjACAAUgBlAG0AbwB2AGUAIABlAHgAaQBzAHQAaQBuAGcAIAByAHUAbABlAC4ADQAKAHQAcgB5AA0ACgBbAFwAewBdAA0ACgBSAGUAbQBvAHYAZQAtAE4AZQB0AEYAaQByAGUAdwBhAGwAbABSAHUAbABlACAALQBEAGkAcwBwAGwAYQB5AE4AYQBtAGUAIAAiAFQAYQBuAGcAbwAgAEYAUwBFACIADQAKAFsAXAB9AF0ADQAKAGMAYQB0AGMAaAAgAFsAXAB7AF0AWwBcAH0AXQ=="/>
     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
     <ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
@@ -905,7 +911,9 @@
     <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
     <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
     <ROW Action="AI_VerifyPrereq" Type="1" Source="Prereq.dll" Target="VerifyPrereq"/>
+    <ROW Action="AddFirewallException" Type="3137" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellScript" AdditionalSeq="AI_DATA_SETTER_3"/>
     <ROW Action="RemoveDiskCache" Type="65" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellScript" AdditionalSeq="AI_DATA_SETTER_1"/>
+    <ROW Action="RemoveFirewallException" Type="3137" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellScript" AdditionalSeq="AI_DATA_SETTER_4"/>
     <ROW Action="ResetDiagnosticsSettings" Type="65" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellScript" AdditionalSeq="AI_DATA_SETTER_2"/>
     <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]"/>
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
@@ -1234,6 +1242,7 @@
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll.meta"/>
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll_1"/>
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll.meta_1"/>
+    <ROW Feature_="TangoFSE" Component_="DeviceId.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="Tango.FSE.LogViewer.UI.exe" SourcePath="..\..\Graphics\FSE\log_viewer_icon.ico" Index="0"/>
@@ -1264,14 +1273,18 @@
     <ROW Action="AI_ExtractFiles" Sequence="3998" Builds="DefaultBuild"/>
     <ROW Action="AI_DATA_SETTER" Sequence="3997"/>
     <ROW Action="AI_EstimateExtractFiles" Sequence="3999" Builds="DefaultBuild"/>
-    <ROW Action="RemoveDiskCache" Condition="( NOT Installed ) AND ( (VersionNT &gt; 501) OR (VersionNT = 501 AND ServicePackLevel &gt;= 2) )" Sequence="5938"/>
-    <ROW Action="AI_DATA_SETTER_1" Condition="( NOT Installed ) AND ( (VersionNT &gt; 501) OR (VersionNT = 501 AND ServicePackLevel &gt;= 2) )" Sequence="5937"/>
+    <ROW Action="RemoveDiskCache" Condition="( NOT Installed ) AND ( (VersionNT &gt; 501) OR (VersionNT = 501 AND ServicePackLevel &gt;= 2) )" Sequence="5942"/>
+    <ROW Action="AI_DATA_SETTER_1" Condition="( NOT Installed ) AND ( (VersionNT &gt; 501) OR (VersionNT = 501 AND ServicePackLevel &gt;= 2) )" Sequence="5941"/>
     <ROW Action="AI_AppSearchEx" Sequence="101"/>
     <ROW Action="AI_VerifyPrereq" Sequence="1101"/>
     <ROW Action="AI_AiRemoveRegsImmediate" Sequence="2599"/>
+    <ROW Action="ResetDiagnosticsSettings" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( &amp;ResetDiagnosticsSettings = 3 )" Sequence="5940"/>
+    <ROW Action="AI_DATA_SETTER_2" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( &amp;ResetDiagnosticsSettings = 3 )" Sequence="5939"/>
+    <ROW Action="AddFirewallException" Condition="( NOT Installed ) AND ( (&amp;AddFirewallException = 3) AND NOT (!AddFirewallException = 3) )" Sequence="5938"/>
+    <ROW Action="AI_DATA_SETTER_3" Condition="( NOT Installed ) AND ( (&amp;AddFirewallException = 3) AND NOT (!AddFirewallException = 3) )" Sequence="5937"/>
+    <ROW Action="RemoveFirewallException" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) AND ( !AddFirewallException = 3 )" Sequence="5936"/>
+    <ROW Action="AI_DATA_SETTER_4" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) ) AND ( !AddFirewallException = 3 )" Sequence="5935"/>
     <ROW Action="AI_AiRemoveFilesImmediate" Sequence="3499"/>
-    <ROW Action="ResetDiagnosticsSettings" Condition="&amp;ResetDiagnosticsSettings = 3" Sequence="5936"/>
-    <ROW Action="AI_DATA_SETTER_2" Condition="&amp;ResetDiagnosticsSettings = 3" Sequence="5935"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureRunnerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureRunnerViewVM.cs
index 6ccc77669..6bf798b4f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureRunnerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ViewModels/ProcedureRunnerViewVM.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core;
 using Tango.Core.Commands;
 using Tango.FSE.Common;
@@ -295,6 +296,12 @@ namespace Tango.FSE.Procedures.ViewModels
 
         private async void HandlerProcedureFileAssociation(FileAssociationPackage package)
         {
+            if (!CurrentUser.HasPermission(Permissions.FSE_RunProcedureProjectFile))
+            {
+                await NotificationProvider.ShowError("Current user profile does not allow loading unpublished procedures.");
+                return;
+            }
+
             if (File.Exists(package.File))
             {
                 try
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
index 578a95ec8..8591cf826 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
@@ -265,5 +265,11 @@ namespace Tango.BL.Enumerations
         [Description("Allows viewing published procedure projects with internal visibility")]
         FSE_ViewInternalPublishedProcedures = 1019,
 
+        /// <summary>
+        /// (Allows running a floating procedure project file.)
+        /// </summary>
+        [Description("Allows running a floating procedure project file.")]
+        FSE_RunProcedureProjectFile = 1020,
+
     }
 }
-- 
cgit v1.3.1