Merge pull request #193 from KelvinTegelaar/dev

Merging Dev to Master. Releasing Gin.
KelvinTegelaar · Nov 5, 2021 · 8cffb34 · 8cffb34
2 parents a598687 + 510ced4
commit 8cffb34
Show file tree

Hide file tree

Showing 49 changed files with 1,970 additions and 187 deletions.
diff --git a/AddDevice.html b/AddDevice.html
@@ -102,7 +102,10 @@ <h5 class="card-title mb-4">Device Details</h5>
                                     methods:
                                     <li> Hardware Hash (available from OEM or on-device script)</li>
                                     <li> Combination of Manufacturer, Device Model, Device Serial Number</li>
-                                    <li>Windows Product Key ID</li>
+                                    <li>Windows Product Key ID</li><br />
+                                    You can also upload a CSV file if your vendor has supplied you with one<br />
+                                    <button class="btn btn-primary" id="upload">Upload CSV</button>
+
                                     <table id="datatable-1" class="datatable-1 table table-striped dataTable"
                                         cellspacing="0" width="100%">
                                         <thead>
@@ -119,6 +122,7 @@ <h5 class="card-title mb-4">Device Details</h5>
                                         </tbody>
                                     </table>
                                     <button class="btn btn-primary" id="but_add" type="button">Add Row</button>
+                                    <input type="file" name="filename" id="filename" accept=".csv" hidden>
                                     <input type="hidden" id="Devices" name="Devices" value="">
                                     <hr class="my-4" />
                                     <div class="d-flex justify-content-between">
@@ -209,4 +213,4 @@ <h5 class="modal-title" id="exampleModalLabel">Results</h5>
                     data-bs-dismiss="modal">Close</button>
             </div>
         </div>
-    </div>
+    </div>
diff --git a/AddGroup.html b/AddGroup.html
@@ -49,7 +49,7 @@ <h1 class="page-header-title">
                             </div>
                             <div class="mb-3">
                                 <label class="small mb-1" for="Description">Description</label>
-                                <input class="form-control" id="Description" placeholder="Enter the display name"
+                                <input class="form-control" id="Description" placeholder="Enter the description"
                                     value="" name="Description" />
                             </div>
                             <!-- Form Group (email address)-->

diff --git a/AddPolicy.html b/AddPolicy.html
@@ -106,9 +106,18 @@ <h5 class="card-title mb-4">Choose a tenant</h5>
                                 <div class="col-xxl-6 col-xl-8">
                                     <h3 class="text-primary">Step 2</h3>
                                     <h5 class="card-title mb-4">Enter the raw JSON for this policy. See
-                                        <a href="https://github.com/KelvinTegelaar/CIPP/blob/master/Documentation/DeployPolicy.md">this
+                                        <a
+                                            href="https://github.com/KelvinTegelaar/CIPP/blob/master/Documentation/DeployPolicy.md">this
                                             link</a> for more information
                                     </h5>
+                                    <div class="mb-3">
+                                        <label for="TemplateType">Select policy type</label>
+                                        <select name="TemplateType" class="form-control" id="TemplateType">
+                                            <option value="Admin">Administrative Template</option>
+                                            <option value="Catalog">Settings Catalog</option>
+                                            <option value="Device">Custom Configuration</option>
+                                        </select>
+                                    </div>
                                     <div class="mb-3">
                                         <label class="small mb-1" for="inputEmailAddress">Policy Name</label>
                                         <input class="form-control" id="inputEmailAddress"

diff --git a/AddUser.html b/AddUser.html
@@ -131,9 +131,9 @@ <h1 class="page-header-title">
 
                             </div>
                             <div class="mb-3">
-                                <label class="small mb-1" for="AddedAliasses">Aliasses</label>
-                                <textarea name="AddedAliasses" class="form-control" id="AddedAliasses" type="email"
-                                    placeholder="Enter one alias per line, leave blank if no aliasses are required."
+                                <label class="small mb-1" for="AddedAliases">Aliases</label>
+                                <textarea name="AddedAliases" class="form-control" id="AddedAliases" type="email"
+                                    placeholder="Enter one alias per line, leave blank if no Aliases are required."
                                     value=""></textarea>
                                 <div class="col-mb-3">
                                     <label class="small mb-1" for="UserlistOptions">Copy group membership from other

diff --git a/Addstandard.html b/Addstandard.html
@@ -63,6 +63,24 @@ <h1 class="page-header-title">
 
                             <div class="row justify-content-center">
                                 <div class="col-xxl-6 col-xl-8">
+                                    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+                                        <symbol id="exclamation-triangle-fill" fill="currentColor" viewBox="0 0 16 16">
+                                            <path
+                                                d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" />
+                                        </symbol>
+                                    </svg>
+
+                                    <div class="alert alert-danger d-flex align-items-center" role="alert">
+                                        <svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img"
+                                            aria-label="Danger:">
+                                            <use xlink:href="#exclamation-triangle-fill" />
+                                        </svg>
+                                        <div>
+                                            WARNING! Setting a standard will make changes to your tenants and set these
+                                            standards on every 365 tenant you select. If you want to
+                                            review only, please use the Best Practice Analyser.
+                                        </div>
+                                    </div>
                                     <h3 class="text-primary">Step 1</h3>
                                     <h5 class="card-title mb-4">Choose a tenant</h5>
                                     Select the list of tenants that should receive your standard configuration. <br>
@@ -170,6 +188,18 @@ <h5 class="card-title mb-4">Select the standard you want to apply</h5>
                                         <label class="form-next buttocheck-label" for="DisableSharedMailbox">Disable
                                             Shared Mailbox AAD accounts</label>
                                     </div>
+                                    <div class="form-check mb-2">
+                                        <input class="form-check-input" id="AutoExpandArchive" name="AutoExpandArchive"
+                                            type="checkbox" value="true" checked />
+                                        <label class="form-next buttocheck-label" for="AutoExpandArchive">Enable
+                                            Auto-expanding archives</label>
+                                    </div>
+                                    <div class="form-check mb-2">
+                                        <input class="form-check-input" id="LegacyMFA" name="LegacyMFA" type="checkbox"
+                                            value="true" checked />
+                                        <label class="form-next buttocheck-label" for="LegacyMFA">Enable
+                                            per-user MFA for all users</label>
+                                    </div>
 
                                     <hr class="my-4" />
                                     <div class="d-flex justify-content-between">

diff --git a/BestPracticeAnalyserList.html b/BestPracticeAnalyserList.html
@@ -44,6 +44,7 @@ <h1 class="page-header-title">
                                 <th>Modern Auth Enabled</th>
                                 <th>Shared Mailboxes Logins Disabled</th>
                                 <th>Unused Licenses</th>
+                                <th>Microsoft Secure Score</th>
                             </tr>
                         </thead>
                         <tbody id='AccountTable'>
@@ -60,8 +61,9 @@ <h1 class="page-header-title">
                                 <th>Privacy in Reports Enabled</th>
                                 <th>Self Service Password Reset Enabled</th>
                                 <th>Modern Auth Enabled</th>
-                                <th>Shared Mailboxes Logins Disabled</th>
+                                <th>Shared Mailboxes Logins Enabled</th>
                                 <th>Unused Licenses</th>
+                                <th>Microsoft Secure Score</th>
                             </tr>
                         </tfoot>
                     </table>

diff --git a/Documentation/BackendAccess.md b/Documentation/BackendAccess.md
@@ -0,0 +1,24 @@
+<p align="center"><a href="https://cyberdrain.com" target="_blank" rel="noopener noreferrer"><img src="../assets/img/CyberDrain.png" alt="CyberDrain Logo"></a></p>
+
+# Backend access
+
+You can gain access to the Azure backend by browsing to your Azure Portal. We also include an easy way to jump to the correct locations via the configuration settings -> Security page. Clicking on "Get backend URLS" gives you all the important URLs for your specific environment.
+
+## Resource group
+
+This is the location of all your resources.
+
+## Key vault
+
+This is your password storage, if you want to change your keys manually this can be done here. CIPP rotates these keys automatically each Sunday.
+
+## Function application
+
+The overview page alows you to stop the API, or restart it. 
+The configuration page allows you to change settings. If you want to set the timezone, check out [this](https://daniel.mcloughlin.cloud/set-azure-function-timezone) URL.
+The deployment center allows you to sync the API to the latest version
+
+## Static webapp
+
+Custom domains brings you to the location where you can change the custom domains
+Role management allows you to invite users, and set the roles for users.
diff --git a/Documentation/Contributions.md b/Documentation/Contributions.md
@@ -18,6 +18,15 @@ Feature requests that request integration with anything but M365 will be closed.
 # Pull Requests
 
 We do not accept PRs or commits against Master. Master is always the final version. For both CIPP and CIPP-API we have two branches. Dev and Master. Please make any PR against Dev, when Dev is promoted to final we'll PR that against master.
+
+# Naming Standards
+
+We follow a naming standard, as based on the name a user might get access to an API or not. Our current naming standard is as follows;
+ListBla - Everything that generates a list (users)
+EditBla - Anything that edits an exisiting object (edit user)
+AddBla - Anything that adds an object (add user)
+RemoveBla - Anything that deletes or removes an object (remove user)
+ExecBla - Anything that executes an action (send mfa request to user)
 ## Creating two instances
 
 - Make a clone of your forked repo
@@ -64,7 +73,7 @@ jobs:
 So you want to jump in on helping us make this awesome? You'll need a local development environment. I'm assuming you have *some* programming experience. You'll need a couple of tools to get started
 
 - Install [node.js](https://nodejs.org/en/)
-- Install .NET Core 2 and .NET Core 5
+- Install [.NET Core 2 SDK](https://dotnet.microsoft.com/download/dotnet/2.2) and [.NET Core 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
 - After installation execute the following commands:
 ```
 npm install -g @azure/static-web-apps-cli
@@ -98,6 +107,7 @@ Local.settings.json example:
   "IsEncrypted": false,
   "Values": {
     "FUNCTIONS_WORKER_RUNTIME": "powershell",
+    "FUNCTIONS_WORKER_RUNTIME_VERSION": "~7",
     "AzureWebJobsStorage": "DefaultEndpointsProtocol=AzureStorageConnectionStringhere",
     "applicationid": "appid",
     "applicationsecret": "applicationsecret",

diff --git a/Documentation/DeployPolicy.md b/Documentation/DeployPolicy.md
@@ -7,15 +7,16 @@ To create a policy an get it's raw JSON information you'll have to go to the [en
 - Go to Devices -> Configuration Profiles
 - Create a new configuration profile
 - Choose "Windows 10 and later" as a platform
-- Choose "Templates" and then "Administrative Templates"
+- Choose "Templates" and then select any option.
 - Select all the settings you want, remember that there are both computer policies and user policies.
 - at Review and Create, do not click on the "Create" button but press F12 on your keyboard to open the developer tools.
-- Now click on "Create" and look for the "UpdateDefiniationValues" post request. 
+- Now click on "Create" and look for the "UpdateDefiniationValues" post request for administrative templates, or any other POST request for other templates. 
 - Click on "Headers" and scroll down to "request payload". this is the raw JSON paylow. To easily copy it, click on "view source" and copy the entire text string.
 - You can now use CIPP to deploy this policy to all tenants.
 
 
 
 # Current known issues / Limitations
 
-Only "Administrative Templates" are supported, others might work too but have not been tested.
+- All templates are currently supported, if you do not see your template type in the list, you must select Custom Configuration
+- When using Settings Catalog or Custom Configuration, the Display Name and Description are using from the raw JSON file.