add valudate tests

f0ssel · f0ssel · commit e8d0fae650cd · 2024-04-05T15:31:18.000Z
diff --git a/coderd/workspaceapps/request.go b/coderd/workspaceapps/request.go
@@ -320,7 +320,7 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR
 		}
 
 		// If the app slug is a port number, then route to the port as an
-		// "anonymous app". We only support HTTP for port-based URLs.
+		// "anonymous app".
 		//
 		// This is only supported for subdomain-based applications.
 		appURL = fmt.Sprintf("%s://127.0.0.1:%d", protocol, portUint)
@@ -353,10 +353,6 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR
 			}
 			// No port share found, so we keep default to owner.
 		} else {
-			if ps.Protocol == database.PortShareProtocolHttps {
-				// Apply HTTPS protocol if specified.
-				appURL = fmt.Sprintf("https://127.0.0.1:%d", portUint)
-			}
 			appSharingLevel = ps.ShareLevel
 		}
 	} else {
diff --git a/coderd/workspaceapps/request_test.go b/coderd/workspaceapps/request_test.go
@@ -57,6 +57,26 @@ func Test_RequestValidate(t *testing.T) {
 				AppSlugOrPort:     "baz",
 			},
 		},
+		{
+			name: "OK5",
+			req: workspaceapps.Request{
+				AccessMethod:      workspaceapps.AccessMethodSubdomain,
+				BasePath:          "/",
+				UsernameOrID:      "foo",
+				WorkspaceNameOrID: "bar",
+				AppSlugOrPort:     "8080",
+			},
+		},
+		{
+			name: "OK6",
+			req: workspaceapps.Request{
+				AccessMethod:      workspaceapps.AccessMethodSubdomain,
+				BasePath:          "/",
+				UsernameOrID:      "foo",
+				WorkspaceNameOrID: "bar",
+				AppSlugOrPort:     "8080s",
+			},
+		},
 		{
 			name: "NoAccessMethod",
 			req: workspaceapps.Request{
diff --git a/coderd/workspaceapps/token_test.go b/coderd/workspaceapps/token_test.go
@@ -222,6 +222,54 @@ func Test_TokenMatchesRequest(t *testing.T) {
 			},
 			want: false,
 		},
+		{
+			name: "PortPortocolHTTP",
+			req: workspaceapps.Request{
+				AccessMethod:      workspaceapps.AccessMethodSubdomain,
+				Prefix:            "yolo--",
+				BasePath:          "/",
+				UsernameOrID:      "foo",
+				WorkspaceNameOrID: "bar",
+				AgentNameOrID:     "baz",
+				AppSlugOrPort:     "8080",
+			},
+			token: workspaceapps.SignedToken{
+				Request: workspaceapps.Request{
+					AccessMethod:      workspaceapps.AccessMethodSubdomain,
+					Prefix:            "yolo--",
+					BasePath:          "/",
+					UsernameOrID:      "foo",
+					WorkspaceNameOrID: "bar",
+					AgentNameOrID:     "baz",
+					AppSlugOrPort:     "8080",
+				},
+			},
+			want: true,
+		},
+		{
+			name: "PortPortocolHTTPS",
+			req: workspaceapps.Request{
+				AccessMethod:      workspaceapps.AccessMethodSubdomain,
+				Prefix:            "yolo--",
+				BasePath:          "/",
+				UsernameOrID:      "foo",
+				WorkspaceNameOrID: "bar",
+				AgentNameOrID:     "baz",
+				AppSlugOrPort:     "8080s",
+			},
+			token: workspaceapps.SignedToken{
+				Request: workspaceapps.Request{
+					AccessMethod:      workspaceapps.AccessMethodSubdomain,
+					Prefix:            "yolo--",
+					BasePath:          "/",
+					UsernameOrID:      "foo",
+					WorkspaceNameOrID: "bar",
+					AgentNameOrID:     "baz",
+					AppSlugOrPort:     "8080",
+				},
+			},
+			want: true,
+		},
 	}
 
 	for _, c := range cases {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`// If the app slug is a port number, then route to the port as an`
`323`		`- // "anonymous app". We only support HTTP for port-based URLs.`
	`323`	`+ // "anonymous app".`
`324`	`324`	`//`
`325`	`325`	`// This is only supported for subdomain-based applications.`
`326`	`326`	`appURL = fmt.Sprintf("%s://127.0.0.1:%d", protocol, portUint)`
`@@ -353,10 +353,6 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR`
`353`	`353`	`}`
`354`	`354`	`// No port share found, so we keep default to owner.`
`355`	`355`	`} else {`
`356`		`- if ps.Protocol == database.PortShareProtocolHttps {`
`357`		`- // Apply HTTPS protocol if specified.`
`358`		`- appURL = fmt.Sprintf("https://127.0.0.1:%d", portUint)`
`359`		`- }`
`360`	`356`	`appSharingLevel = ps.ShareLevel`
`361`	`357`	`}`
`362`	`358`	`} else {`