Updated oasis.integration package

pk910 · Jun 16, 2018 · 0270fbe · 0270fbe
1 parent 82fbdc1
commit 0270fbe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj b/Myrtille.MFAProviders/Myrtille.MFAProviders.csproj
@@ -31,9 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OASIS.Integration, Version=1.6.1.0, Culture=neutral, PublicKeyToken=0c18c0483c9815ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\OASIS.Integration.1.6.1\lib\OASIS.Integration.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OASIS.Integration, Version=1.7.0.0, Culture=neutral, PublicKeyToken=bf7fa19775bc8b36, processorArchitecture=MSIL">
+      <HintPath>..\packages\OASIS.Integration.1.7.0\lib\OASIS.Integration.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -49,15 +48,15 @@
     <Compile Include="OASISOTPProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Myrtille.Services.Contracts\Myrtille.Services.Contracts.csproj">
       <Project>{010e1702-3045-4b13-bfb6-06ffc60b5cbb}</Project>
       <Name>Myrtille.Services.Contracts</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Myrtille.MFAProviders/packages.config b/Myrtille.MFAProviders/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OASIS.Integration" version="1.6.1" targetFramework="net45" />
+  <package id="OASIS.Integration" version="1.7.0" targetFramework="net45" />
 </packages>
diff --git a/Myrtille.Services/app.config b/Myrtille.Services/app.config
@@ -170,7 +170,7 @@
     <add key="OASISApiKey" value="login to oasis admin and go to application for value" />
     <add key="OASISAppKey" value="login to oasis admin and go to application for value" />
     <add key="OASISAppID" value="login to oasis admin and go to application for value" />
-    
+
     <!-- uncomment the adapter line below to use enterprise mode -->
     <!--<add key="EnterpriseAdapter" value="Myrtille.Enterprise.ActiveDirectory, Myrtille.Enterprise" />-->
     <add key="EnterpriseAdminGroup" value="a domain group who can administer hosts" />

diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
@@ -233,7 +233,7 @@ private void UpdateControls()
                 browser.Value = RemoteSession.CompatibilityMode ? "HTML5" : "HTML4";
                 browser.Disabled = false;
                 scale.Value = RemoteSession.ScaleDisplay ? "Unscale" : "Scale";
-                scale.Disabled = RemoteSession.HostType == HostTypeEnum.RDP;
+                scale.Disabled = RemoteSession.HostType != HostTypeEnum.RDP;
                 keyboard.Disabled = false;
                 // disable clipboard for SSH or if set to disable in config
                 clipboard.Disabled = RemoteSession.HostType == HostTypeEnum.SSH || !RemoteSession.AllowRemoteClipboard;

diff --git a/Myrtille.Web/Web.config b/Myrtille.Web/Web.config
@@ -42,7 +42,7 @@
   </system.diagnostics>
 
   <system.web>
-    <compilation defaultLanguage="C#" debug="true" targetFramework="4.5"/>
+    <compilation defaultLanguage="C#" targetFramework="4.5"/>
     <!-- handle file upload/download up to 1GB. maxRequestLength is measured in kilobytes and executionTimeout in seconds -->
     <httpRuntime requestValidationMode="4.5" targetFramework="4.5" maxRequestLength="1048576" executionTimeout="360000"/>
     <pages enableViewState="false" validateRequest="false" enableEventValidation="false" clientIDMode="AutoID"/>
@@ -57,7 +57,6 @@
     <!--<sessionState mode="InProc" cookieless="UseUri" timeout="60"/>-->
     <sessionState mode="InProc" cookieless="UseCookies" cookieName="AuthSecToken" timeout="60"/>
     <globalization requestEncoding="utf-8" responseEncoding="utf-8" culture="auto" uiCulture="auto"/>
-    <customErrors mode="Off"/>
   </system.web>
 
   <system.webServer>
@@ -80,7 +79,6 @@
     <handlers>
       <add path="/SocketHandler.ashx" verb="*" name="SocketHandler" type="Myrtille.Web.SocketHandler"/>
     </handlers>
-    <httpErrors errorMode="Detailed"/>
   </system.webServer>
 
   <system.serviceModel>

diff --git a/Myrtille.Web/popups/EditHost.aspx.cs b/Myrtille.Web/popups/EditHost.aspx.cs
@@ -101,6 +101,7 @@ protected void Page_Load(
                                         securityProtocol.SelectedIndex = (int)host.Protocol;
                                         _hostType = host.HostType.ToString();
                                         promptCredentials.Checked = host.PromptForCredentials;
+                                        startProgram.Value = host.StartRemoteProgram;
                                     }
                                 }
                                 catch (Exception exc)