From a5bcec5cd4c6a00b0e2d289729ead6b58eb3905b Mon Sep 17 00:00:00 2001
From: Ben <wilsob12@gmail.com>
Date: Tue, 14 Nov 2023 23:51:09 -0500
Subject: [PATCH] added more validation for AxeOS settings

---
 .../app/components/edit/edit.component.html    | 18 +++++++++---------
 .../src/app/components/edit/edit.component.ts  | 13 +++++++++++--
 main/http_server/axe-os/src/styles.scss        | 12 ++++++++++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/main/http_server/axe-os/src/app/components/edit/edit.component.html b/main/http_server/axe-os/src/app/components/edit/edit.component.html
index 45a52359..1a9e4567 100644
--- a/main/http_server/axe-os/src/app/components/edit/edit.component.html
+++ b/main/http_server/axe-os/src/app/components/edit/edit.component.html
@@ -22,7 +22,7 @@
                 <input formControlName="wifiPass" type="password">
             </div>
             <div class="form-group">
-                <label>Stratum URL:</label>
+                <label>Stratum URL: (Do not include 'stratum+tcp://' or port</label>
                 <input formControlName="stratumURL" type="text">
             </div>
             <div class="form-group">
@@ -116,22 +116,22 @@
             </div>
 
 
-            <div class="form-group">
-                <label>Fan Speed {{form.controls['fanspeed'].value}}% <span
-                        *ngIf="form.controls['autofanspeed'].value == true">(disabled, automatic) </span> <b
-                        *ngIf="form.controls['fanspeed'].value < 33" style="color:red">Danger: Could Cause
+            <div class="form-group" *ngIf="form.controls['autofanspeed'].value != true">
+                <label>Fan Speed {{form.controls['fanspeed'].value}}%
+                    <b *ngIf="form.controls['fanspeed'].value < 33" style="color:red">Danger: Could Cause
                         Overheating</b> <b *ngIf="form.controls['fanspeed'].value == 100" style="color:	#F2A900">S19
                         Simulator</b></label>
                 <input formControlName="fanspeed" type="range" [min]="0" [max]="100">
             </div>
+            <div class="mt-2">
+                <button [disabled]="form.invalid" (click)="updateSystem()" class="btn btn-primary mr-2">Save</button>
+                <b style="line-height: 34px;">You must restart this device after saving for changes to take effect.</b>
+            </div>
+
 
         </form>
     </ng-container>
 
-    <div class="mt-2">
-        <button (click)="updateSystem()" class="btn btn-primary mr-2">Save</button>
-        <b style="line-height: 34px;">You must restart this device after saving for changes to take effect.</b>
-    </div>
 
 
 </div>
diff --git a/main/http_server/axe-os/src/app/components/edit/edit.component.ts b/main/http_server/axe-os/src/app/components/edit/edit.component.ts
index 9c8b45f7..6610cc98 100644
--- a/main/http_server/axe-os/src/app/components/edit/edit.component.ts
+++ b/main/http_server/axe-os/src/app/components/edit/edit.component.ts
@@ -42,8 +42,17 @@ export class EditComponent {
         this.form = this.fb.group({
           flipscreen: [info.flipscreen == 1],
           invertscreen: [info.invertscreen == 1],
-          stratumURL: [info.stratumURL, [Validators.required]],
-          stratumPort: [info.stratumPort, [Validators.required]],
+          stratumURL: [info.stratumURL, [
+            Validators.required,
+            Validators.pattern(/^(?!.*stratum\+tcp:\/\/).*$/),
+            Validators.pattern(/^[^:]*$/),
+          ]],
+          stratumPort: [info.stratumPort, [
+            Validators.required,
+            Validators.pattern(/^[^:]*$/),
+            Validators.min(0),
+            Validators.max(65353)
+          ]],
           stratumUser: [info.stratumUser, [Validators.required]],
           ssid: [info.ssid, [Validators.required]],
           wifiPass: [info.wifiPass, [Validators.required]],
diff --git a/main/http_server/axe-os/src/styles.scss b/main/http_server/axe-os/src/styles.scss
index e4dfc3f1..7800d918 100644
--- a/main/http_server/axe-os/src/styles.scss
+++ b/main/http_server/axe-os/src/styles.scss
@@ -94,6 +94,18 @@ button {
 
 }
 
+button:disabled,
+button[disabled] {
+    background: #45657f;
+    border: 1px solid #1c4567;
+    cursor: not-allowed;
+
+    &:hover {
+        background: #45657f;
+        border: 1px solid #1c4567;
+    }
+}
+
 input[type="text"],
 input[type="password"],
 input[type="number"],