Merge pull request #2383 from cloudfoundry-incubator/route-sanity-che…

…cking Validate host/path pattern in Create Route form
cloudfoundry · Jun 19, 2018 · 962fcdb · 962fcdb
2 parents 9270744 + 63e887b
commit 962fcdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/frontend/app/features/applications/routes/add-routes/add-routes.component.html b/src/frontend/app/features/applications/routes/add-routes/add-routes.component.html
@@ -30,11 +30,13 @@
         <div>
           <mat-form-field>
             <input matInput formControlName="host" placeholder="Host" required>
+            <mat-error *ngIf="addHTTPRoute.controls['host'].errors?.pattern">Invalid Hostname</mat-error>
           </mat-form-field>
         </div>
         <div>
           <mat-form-field>
             <input matInput formControlName="path" placeholder="Path">
+            <mat-error *ngIf="addHTTPRoute.controls['path'].errors?.pattern">Invalid Path</mat-error>
             <span matPrefix>/&nbsp;</span>
           </mat-form-field>
         </div>

diff --git a/src/frontend/app/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/app/features/applications/routes/add-routes/add-routes.component.ts
@@ -36,7 +36,8 @@ import { FetchAllDomains } from '../../../../store/actions/domains.actions';
 import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/reducers/pagination-reducer/pagination-reducer.helper';
 
-
+const hostPattern = '^([\\w\\-\\.]*)$';
+const pathPattern = `^([\\w\\-\\/\\!\\#\\[\\]\\@\\&\\$\\'\\(\\)\\*\\+\\;\\=\\,]*)$`;
 @Component({
   selector: 'app-add-routes',
   templateUrl: './add-routes.component.html',
@@ -87,8 +88,8 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
     });
 
     this.addHTTPRoute = new FormGroup({
-      host: new FormControl('', [<any>Validators.required]),
-      path: new FormControl('')
+      host: new FormControl('', [<any>Validators.required, Validators.pattern(hostPattern)]),
+      path: new FormControl('', [Validators.pattern(pathPattern)])
     });
     this.addRouteMode = this.addRouteModes[0];