Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit92843b2

Browse files
committed
time to fix it
1 parente9a4817 commit92843b2

File tree

7 files changed

+32
-19
lines changed

7 files changed

+32
-19
lines changed

‎codersdk/deployment.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,9 +3109,11 @@ func (c *Client) SSHConfiguration(ctx context.Context) (SSHConfigResponse, error
31093109
typeCryptoKeyFeaturestring
31103110

31113111
const (
3112-
CryptoKeyFeatureWorkspaceAppCryptoKeyFeature="workspace_apps"
3113-
CryptoKeyFeatureOIDCConvertCryptoKeyFeature="oidc_convert"
3114-
CryptoKeyFeatureTailnetResumeCryptoKeyFeature="tailnet_resume"
3112+
CryptoKeyFeatureWorkspaceAppAPIKeyCryptoKeyFeature="workspace_apps_api_key"
3113+
//nolint:gosec // This denotes a type of key, not a literal.
3114+
CryptoKeyFeatureWorkspaceAppsTokenCryptoKeyFeature="workspace_apps_token"
3115+
CryptoKeyFeatureOIDCConvertCryptoKeyFeature="oidc_convert"
3116+
CryptoKeyFeatureTailnetResumeCryptoKeyFeature="tailnet_resume"
31153117
)
31163118

31173119
typeCryptoKeystruct {

‎enterprise/coderd/workspaceproxy.go‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"fmt"
88
"net/http"
99
"net/url"
10+
"slices"
1011
"strings"
1112
"time"
1213

@@ -720,13 +721,29 @@ func (api *API) workspaceProxyRegister(rw http.ResponseWriter, r *http.Request)
720721
// @Security CoderSessionToken
721722
// @Produce json
722723
// @Tags Enterprise
724+
// @Param feature query string true "Feature key"
723725
// @Success 200 {object} wsproxysdk.CryptoKeysResponse
724726
// @Router /workspaceproxies/me/crypto-keys [get]
725727
// @x-apidocgen {"skip": true}
726728
func (api*API)workspaceProxyCryptoKeys(rw http.ResponseWriter,r*http.Request) {
727729
ctx:=r.Context()
728730

729-
keys,err:=api.Database.GetCryptoKeysByFeature(ctx,database.CryptoKeyFeatureWorkspaceAppsAPIKey)
731+
feature:=database.CryptoKeyFeature(r.URL.Query().Get("feature"))
732+
iffeature=="" {
733+
httpapi.Write(r.Context(),rw,http.StatusBadRequest, codersdk.Response{
734+
Message:"Missing feature query parameter.",
735+
})
736+
return
737+
}
738+
739+
if!slices.Contains(database.AllCryptoKeyFeatureValues(),feature) {
740+
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
741+
Message:fmt.Sprintf("Invalid feature: %q",feature),
742+
})
743+
return
744+
}
745+
746+
keys,err:=api.Database.GetCryptoKeysByFeature(ctx,feature)
730747
iferr!=nil {
731748
httpapi.InternalServerError(rw,err)
732749
return

‎enterprise/coderd/workspaceproxy_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ func TestProxyRegisterDeregister(t *testing.T) {
320320
}
321321
registerRes1,err:=proxyClient.RegisterWorkspaceProxy(ctx,req)
322322
require.NoError(t,err)
323-
require.NotEmpty(t,registerRes1.AppSecurityKey)
324323
require.NotEmpty(t,registerRes1.DERPMeshKey)
325324
require.EqualValues(t,10001,registerRes1.DERPRegionID)
326325
require.Empty(t,registerRes1.SiblingReplicas)
@@ -955,7 +954,7 @@ func TestGetCryptoKeys(t *testing.T) {
955954
Name:testutil.GetRandomName(t),
956955
})
957956

958-
keys,err:=proxy.SDKClient.CryptoKeys(ctx)
957+
keys,err:=proxy.SDKClient.CryptoKeys(ctx,codersdk.CryptoKeyFeatureWorkspaceAppAPIKey)
959958
require.NoError(t,err)
960959
require.NotEmpty(t,keys)
961960
require.Equal(t,2,len(keys.CryptoKeys))
@@ -987,7 +986,7 @@ func TestGetCryptoKeys(t *testing.T) {
987986
client:=wsproxysdk.New(cclient.URL)
988987
client.SetSessionToken(cclient.SessionToken())
989988

990-
_,err:=client.CryptoKeys(ctx)
989+
_,err:=client.CryptoKeys(ctx,codersdk.CryptoKeyFeatureWorkspaceAppAPIKey)
991990
require.Error(t,err)
992991
varsdkErr*codersdk.Error
993992
require.ErrorAs(t,err,&sdkErr)

‎enterprise/wsproxy/wsproxy.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
198198
derpServer:=derp.NewServer(key.NewNode(),tailnet.Logger(opts.Logger.Named("net.derp")))
199199

200200
ctx,cancel:=context.WithCancel(context.Background())
201+
201202
r:=chi.NewRouter()
202203
s:=&Server{
203204
Options:opts,

‎enterprise/wsproxy/wsproxysdk/wsproxysdk.go‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ type RegisterWorkspaceProxyRequest struct {
205205
}
206206

207207
typeRegisterWorkspaceProxyResponsestruct {
208-
AppSecurityKeystring`json:"app_security_key"`
209208
DERPMeshKeystring`json:"derp_mesh_key"`
210209
DERPRegionIDint32`json:"derp_region_id"`
211210
DERPMap*tailcfg.DERPMap`json:"derp_map"`
@@ -372,12 +371,6 @@ func (l *RegisterWorkspaceProxyLoop) Start(ctx context.Context) (RegisterWorkspa
372371
}
373372
failedAttempts=0
374373

375-
// Check for consistency.
376-
iforiginalRes.AppSecurityKey!=resp.AppSecurityKey {
377-
l.failureFn(xerrors.New("app security key has changed, proxy must be restarted"))
378-
return
379-
}
380-
381374
iforiginalRes.DERPMeshKey!=resp.DERPMeshKey {
382375
l.failureFn(xerrors.New("DERP mesh key has changed, proxy must be restarted"))
383376
return
@@ -586,10 +579,10 @@ type CryptoKeysResponse struct {
586579
CryptoKeys []codersdk.CryptoKey`json:"crypto_keys"`
587580
}
588581

589-
func (c*Client)CryptoKeys(ctx context.Context) (CryptoKeysResponse,error) {
582+
func (c*Client)CryptoKeys(ctx context.Context,feature codersdk.CryptoKeyFeature) (CryptoKeysResponse,error) {
590583
res,err:=c.Request(ctx,http.MethodGet,
591584
"/api/v2/workspaceproxies/me/crypto-keys",
592-
nil,
585+
codersdk.WithQueryParam("feature",string(feature)),
593586
)
594587
iferr!=nil {
595588
returnCryptoKeysResponse{},xerrors.Errorf("make request: %w",err)

‎tailnet/resume.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func NewResumeTokenKeyProvider(key jwtutils.SigningKeyManager, clock quartz.Cloc
6363
returnResumeTokenKeyProvider{
6464
key:key,
6565
clock:clock,
66-
expiry:DefaultResumeTokenExpiry,
66+
expiry:expiry,
6767
}
6868
}
6969

‎tailnet/resume_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ func TestResumeTokenKeyProvider(t *testing.T) {
5454
require.Equal(t,tailnet.DefaultResumeTokenExpiry/2,token.RefreshIn.AsDuration())
5555
require.WithinDuration(t,clock.Now().Add(tailnet.DefaultResumeTokenExpiry),token.ExpiresAt.AsTime(),time.Second)
5656

57-
// Advance time past expiry
58-
_=clock.Advance(tailnet.DefaultResumeTokenExpiry+time.Second)
57+
// Advance time past expiry. Account for leeway.
58+
_=clock.Advance(tailnet.DefaultResumeTokenExpiry+time.Second*61)
5959

6060
_,err=provider.VerifyResumeToken(ctx,token.Token)
61+
require.Error(t,err)
6162
require.ErrorIs(t,err,jwt.ErrExpired)
6263
})
6364

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp