Commit175c10e

committed

obfuscate workspace module source and version

1 parent6afa1cd commit175c10eCopy full SHA for 175c10e

File tree

+33

-2

lines changed

+33

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -677,12 +677,20 @@ func ConvertWorkspaceResourceMetadata(metadata database.WorkspaceResourceMetadat`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`funcConvertWorkspaceModule(module database.WorkspaceModule)WorkspaceModule {`
	`680`	`+isCoderModule:=strings.Contains(module.Source,"registry.coder.com")`
	`681`	`+source:=module.Source`
	`682`	`+version:=module.Version`
	`683`	`+if!isCoderModule {`
	`684`	`+source=fmt.Sprintf("%x",sha256.Sum256([]byte(source)))`
	`685`	`+version=fmt.Sprintf("%x",sha256.Sum256([]byte(version)))`
	`686`	`+}`
	`687`	`+`
`680`	`688`	`returnWorkspaceModule{`
`681`	`689`	`ID:module.ID,`
`682`	`690`	`JobID:module.JobID,`
`683`	`691`	`Transition:module.Transition,`
`684`		`-Source:module.Source,`
`685`		`-Version:module.Version,`
	`692`	`+Source:source,`
	`693`	`+Version:version,`
`686`	`694`	`Key:module.Key,`
`687`	`695`	`CreatedAt:module.CreatedAt,`
`688`	`696`	`}`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`"net/http/httptest"`
`7`	`7`	`"net/url"`
	`8`	`+"sort"`
`8`	`9`	`"testing"`
`9`	`10`	`"time"`
`10`	`11`
`@@ -122,6 +123,28 @@ func TestTelemetry(t *testing.T) {`
`122`	`123`	`require.Len(t,snapshot.Users,1)`
`123`	`124`	`require.Equal(t,snapshot.Users[0].EmailHashed,"bb44bf07cf9a2db0554bba63a03d822c927deae77df101874496df5a6a3e896d@coder.com")`
`124`	`125`	`})`
	`126`	`+t.Run("HashedModule",func(t*testing.T) {`
	`127`	`+t.Parallel()`
	`128`	`+db:=dbmem.New()`
	`129`	`+_=dbgen.WorkspaceModule(t,db, database.WorkspaceModule{`
	`130`	`+Source:"registry.coder.com/terraform/aws",`
	`131`	`+Version:"1.0.0",`
	`132`	`+})`
	`133`	`+_=dbgen.WorkspaceModule(t,db, database.WorkspaceModule{`
	`134`	`+Source:"internal-url.com/some-module",`
	`135`	`+Version:"1.0.0",`
	`136`	`+})`
	`137`	`+_,snapshot:=collectSnapshot(t,db,nil)`
	`138`	`+require.Len(t,snapshot.WorkspaceModules,2)`
	`139`	`+modules:=snapshot.WorkspaceModules`
	`140`	`+sort.Slice(modules,func(i,jint)bool {`
	`141`	`+returnmodules[i].Source<modules[j].Source`
	`142`	`+})`
	`143`	`+require.Equal(t,modules[0].Source,"921c61d6f3eef5118f3cae658d1518b378c5b02a4955a766c791440894d989c5")`
	`144`	`+require.Equal(t,modules[0].Version,"92521fc3cbd964bdc9f584a991b89fddaa5754ed1cc96d6d42445338669c1305")`
	`145`	`+require.Equal(t,modules[1].Source,"registry.coder.com/terraform/aws")`
	`146`	`+require.Equal(t,modules[1].Version,"1.0.0")`
	`147`	`+})`
`125`	`148`	`}`
`126`	`149`
`127`	`150`	`// nolint:paralleltest`

Comments

(0)