merge conflicts

petrsvihlik · Nov 13, 2021 · c86e147 · c86e147
2 parents b138a03 + c8876da
commit c86e147
Show file tree

Hide file tree

Showing 30 changed files with 349 additions and 214 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -24,7 +24,9 @@ jobs:
     - name: Test
       run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
     - name: Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
     #- name: Run FOSSA scan
     #  uses: fossa-contrib/fossa-action@v1
     #  with:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -36,10 +36,11 @@ jobs:
     - name: Test
       run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
     - name: Codecov
-      uses: codecov/codecov-action@v1
-
+      uses: codecov/codecov-action@v2
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
 
     #- name: Run FOSSA scan
     #  uses: fossa-contrib/fossa-action@v1
     #  with:
-    #    fossa-api-key: ${{ secrets.FOSSA_API_KEY }}
+    #    fossa-api-key: ${{ secrets.FOSSA_API_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,9 @@ jobs:
     - name: Test
       run: dotnet test --no-build --verbosity normal --configuration Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
     - name: Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Pack
       run: dotnet pack --no-build --include-symbols --verbosity normal --configuration Release --output ./artifacts /p:PackageVersion="${{ steps.get_version.outputs.version-without-v }}"
     - name: Upload artifacts

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ Configuration
 | Parameter | Sample value | Description |
 | :--- | :--- | :--- |
 |`Wopi:StorageProviderAssemblyName`| [`"WopiHost.FileSystemProvider"`](https://github.com/petrsvihlik/WopiHost/tree/master/WopiHost.FileSystemProvider) | Name of assembly containing implementation of `WopiHost.Abstractions` interfaces |
-|`Wopi:StorageProviderOptions:RootPath` | [`".\\wopi-docs"`](https://github.com/petrsvihlik/WopiHost/tree/master/WopiHost/wwwroot/wopi-docs) | Provider-specific setting used by `WopiHost.FileSystemProvider` (which is an implementation of `IWopiStorageProvider` working with System.IO) |
+|`Wopi:StorageProvider:RootPath` | [`".\\wopi-docs"`](https://github.com/petrsvihlik/WopiHost/tree/master/WopiHost/wwwroot/wopi-docs) | Provider-specific setting used by `WopiHost.FileSystemProvider` (which is an implementation of `IWopiStorageProvider` working with System.IO) |
 |`Wopi:UseCobalt`| `true`| Whether or not to use [MS-FSSHTTP](https://docs.microsoft.com/en-us/openspecs/sharepoint_protocols/ms-fsshttp/) for file synchronization. More details at [Cobalt](#cobalt)|
 
 ### WopiHost.Web
@@ -71,7 +71,8 @@ Configuration
 | :--- | :--- | :--- |
 | `Wopi:HostUrl` | `"http://wopihost:5000"` | URL pointing to a WopiHost instance (above). It's used by the URL generator. |
 | `Wopi:ClientUrl` | ` "http://owaserver"` | Base URL of your WOPI client - typically, [Office Online Server](#compatible-wopi-clients) - used by the discovery module to load WOPI client URL templates |
-|`Wopi:StorageProviderOptions:RootPath` | [`"..\\..\\WopiHost\\wwwroot\\wopi-docs"`](https://github.com/petrsvihlik/WopiHost/tree/master/WopiHost/wwwroot/wopi-docs) | Provider-specific setting used by `WopiHost.FileSystemProvider` (which is an implementation of `IWopiStorageProvider` working with System.IO) |
+| `Wopi:StorageProvider:RootPath` | [`"..\\..\\WopiHost\\wwwroot\\wopi-docs"`](https://github.com/petrsvihlik/WopiHost/tree/master/WopiHost/wwwroot/wopi-docs) | Provider-specific setting used by `WopiHost.FileSystemProvider` (which is an implementation of `IWopiStorageProvider` working with System.IO) |
+| `Wopi:Discovery:NetZone` | `"InternalHttp"` | Determines the target zone configuration of your [OOS Deployment](https://docs.microsoft.com/en-us/officeonlineserver/deploy-office-online-server). Values correspond with the [`NetZoneEnum`](https://github.com/petrsvihlik/WopiHost/blob/master/WopiHost.Discovery/NetZoneEnum.cs). |
 
 
 Additionally, you can use the [secret storage](https://docs.microsoft.com/en-us/aspnet/core/security/app-secrets?view=aspnetcore-2.2&tabs=windows) to configure both of the apps.

diff --git a/WopiHost.Abstractions/WopiConfigurationSections.cs b/WopiHost.Abstractions/WopiConfigurationSections.cs
@@ -13,6 +13,11 @@ public class WopiConfigurationSections
         /// <summary>
         /// Name of the configuration section related to storage settings.
         /// </summary>
-        public const string STORAGE_OPTIONS = WOPI_ROOT + ":StorageProviderOptions";
+        public const string STORAGE_OPTIONS = WOPI_ROOT + ":StorageProvider";
+
+        /// <summary>
+        /// Name of the configuration section related to WOPI discovery.
+        /// </summary>
+        public const string DISCOEVRY_OPTIONS = WOPI_ROOT + ":Discovery";
     }
 }
diff --git a/WopiHost.Abstractions/WopiHost.Abstractions.csproj b/WopiHost.Abstractions/WopiHost.Abstractions.csproj
@@ -21,8 +21,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
-    <None Include="..\img\logo.png" Pack="true" PackagePath=""/>
+    <None Include="..\LICENSE.txt" Pack="true" PackagePath="" />
+    <None Include="..\img\logo.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -37,9 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="5.0.11" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.9.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.13.1" />
   </ItemGroup>
 
 </Project>
diff --git a/WopiHost.Core/Models/WopiHostOptions.cs b/WopiHost.Core/Models/WopiHostOptions.cs
@@ -11,7 +11,7 @@ public class WopiHostOptions
         public bool UseCobalt { get; set; }
 
         /// <summary>
-        /// Name of the assembly containing the implementation of the <see cref="WopiHost.Abstractions.IWopiStorageProvider"/>.
+        /// Name of the assembly containing the implementation of the <see cref="Abstractions.IWopiStorageProvider"/>.
         /// </summary>
         public string StorageProviderAssemblyName { get; set; }
     }

diff --git a/WopiHost.Core/WopiHost.Core.csproj b/WopiHost.Core/WopiHost.Core.csproj
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
-    <None Include="..\img\logo.png" Pack="true" PackagePath=""/>
+    <None Include="..\LICENSE.txt" Pack="true" PackagePath="" />
+    <None Include="..\img\logo.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -43,7 +43,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.9.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
   </ItemGroup>
 
 </Project>
diff --git a/WopiHost.Discovery.Tests/INVALID_discovery.xml b/WopiHost.Discovery.Tests/INVALID_discovery.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wopi-discovery>
+    <net-zone name="invalid-zone">
+    </net-zone>
+</wopi-discovery>