feat: add proxysdk and proxy tokeng

coder · deansheather · Apr 17, 2023 · Apr 5, 2023 · Apr 5, 2023 · Apr 6, 2023
commit 391fe74761f292cfbb50df825440ce03d1f9933a
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/querier_test.go b/coderd/database/dbauthz/querier_test.go
@@ -445,25 +445,25 @@ func (s *MethodTestSuite) TestWorkspaceProxy() {
 		}).Asserts(rbac.ResourceWorkspaceProxy, rbac.ActionCreate)
 	}))
 	s.Run("UpdateWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
-		p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
+		_, p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
 		check.Args(database.UpdateWorkspaceProxyParams{
 			ID: p.ID,
 		}).Asserts(p, rbac.ActionUpdate)
 	}))
 	s.Run("GetWorkspaceProxyByID", s.Subtest(func(db database.Store, check *expects) {
-		p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
+		_, p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
 		check.Args(p.ID).Asserts(p, rbac.ActionRead).Returns(p)
 	}))
 	s.Run("UpdateWorkspaceProxyDeleted", s.Subtest(func(db database.Store, check *expects) {
-		p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
+		_, p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
 		check.Args(database.UpdateWorkspaceProxyDeletedParams{
 			ID:      p.ID,
 			Deleted: true,
 		}).Asserts(p, rbac.ActionDelete)
 	}))
 	s.Run("GetWorkspaceProxies", s.Subtest(func(db database.Store, check *expects) {
-		p1 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
-		p2 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
+		_, p1 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
+		_, p2 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
 		check.Args().Asserts(p1, rbac.ActionRead, p2, rbac.ActionRead).Returns(slice.New(p1, p2))
 	}))
 }

diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -5032,14 +5032,16 @@ func (q *fakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.Inser
 	}
 
 	p := database.WorkspaceProxy{
-		ID:               arg.ID,
-		Name:             arg.Name,
-		Icon:             arg.Icon,
-		Url:              arg.Url,
-		WildcardHostname: arg.WildcardHostname,
-		CreatedAt:        arg.CreatedAt,
-		UpdatedAt:        arg.UpdatedAt,
-		Deleted:          false,
+		ID:                arg.ID,
+		Name:              arg.Name,
+		DisplayName:       arg.DisplayName,
+		Icon:              arg.Icon,
+		Url:               arg.Url,
+		WildcardHostname:  arg.WildcardHostname,
+		TokenHashedSecret: arg.TokenHashedSecret,
+		CreatedAt:         arg.CreatedAt,
+		UpdatedAt:         arg.UpdatedAt,
+		Deleted:           false,
 	}
 	q.workspaceProxies = append(q.workspaceProxies, p)
 	return p, nil

diff --git a/coderd/database/dbgen/generator.go b/coderd/database/dbgen/generator.go
@@ -338,19 +338,24 @@ func WorkspaceResourceMetadatums(t testing.TB, db database.Store, seed database.
 	return meta
 }
 
-func WorkspaceProxy(t testing.TB, db database.Store, orig database.WorkspaceProxy) database.WorkspaceProxy {
+func WorkspaceProxy(t testing.TB, db database.Store, orig database.WorkspaceProxy) (string, database.WorkspaceProxy) {
+	secret, err := cryptorand.HexString(64)
+	require.NoError(t, err, "generate secret")
+	hashedSecret := sha256.Sum256([]byte(secret))
+
 	resource, err := db.InsertWorkspaceProxy(context.Background(), database.InsertWorkspaceProxyParams{
-		ID:               takeFirst(orig.ID, uuid.New()),
-		Name:             takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
-		DisplayName:      takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
-		Icon:             takeFirst(orig.Icon, namesgenerator.GetRandomName(1)),
-		Url:              takeFirst(orig.Url, fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1))),
-		WildcardHostname: takeFirst(orig.WildcardHostname, fmt.Sprintf(".%s.com", namesgenerator.GetRandomName(1))),
-		CreatedAt:        takeFirst(orig.CreatedAt, database.Now()),
-		UpdatedAt:        takeFirst(orig.UpdatedAt, database.Now()),
+		ID:                takeFirst(orig.ID, uuid.New()),
+		Name:              takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
+		DisplayName:       takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
+		Icon:              takeFirst(orig.Icon, namesgenerator.GetRandomName(1)),
+		Url:               takeFirst(orig.Url, fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1))),
+		WildcardHostname:  takeFirst(orig.WildcardHostname, fmt.Sprintf("*.%s.com", namesgenerator.GetRandomName(1))),
+		TokenHashedSecret: hashedSecret[:],
+		CreatedAt:         takeFirst(orig.CreatedAt, database.Now()),
+		UpdatedAt:         takeFirst(orig.UpdatedAt, database.Now()),
 	})
 	require.NoError(t, err, "insert app")
-	return resource
+	return secret, resource
 }
 
 func File(t testing.TB, db database.Store, orig database.File) database.File {

diff --git a/coderd/database/dbgen/generator_test.go b/coderd/database/dbgen/generator_test.go
@@ -78,7 +78,8 @@ func TestGenerator(t *testing.T) {
 	t.Run("WorkspaceProxy", func(t *testing.T) {
 		t.Parallel()
 		db := dbfake.New()
-		exp := dbgen.WorkspaceProxy(t, db, database.WorkspaceProxy{})
+		secret, exp := dbgen.WorkspaceProxy(t, db, database.WorkspaceProxy{})
+		require.Len(t, secret, 64)
 		require.Equal(t, exp, must(db.GetWorkspaceProxyByID(context.Background(), exp.ID)))
 	})