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

Commita494489

Browse files
authored
fix: use valid ip mask in api keys when remote address is ipv6 (#2695)
1 parent69f27ef commita494489

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎coderd/httpmw/apikey.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,11 @@ func ExtractAPIKey(db database.Store, oauth *OAuth2Configs) func(http.Handler) h
172172
ifremoteIP==nil {
173173
remoteIP=net.IPv4(0,0,0,0)
174174
}
175+
bitlen:=len(remoteIP)*8
175176
key.IPAddress= pqtype.Inet{
176177
IPNet: net.IPNet{
177178
IP:remoteIP,
178-
Mask:remoteIP.DefaultMask(),
179+
Mask:net.CIDRMask(bitlen,bitlen),
179180
},
180181
Valid:true,
181182
}

‎coderd/users.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,14 +815,15 @@ func (api *API) createAPIKey(rw http.ResponseWriter, r *http.Request, params dat
815815
ifip==nil {
816816
ip=net.IPv4(0,0,0,0)
817817
}
818+
bitlen:=len(ip)*8
818819
key,err:=api.Database.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{
819820
ID:keyID,
820821
UserID:params.UserID,
821822
LifetimeSeconds:params.LifetimeSeconds,
822823
IPAddress: pqtype.Inet{
823824
IPNet: net.IPNet{
824825
IP:ip,
825-
Mask:ip.DefaultMask(),
826+
Mask:net.CIDRMask(bitlen,bitlen),
826827
},
827828
Valid:true,
828829
},

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp