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

Commitc1ae295

Browse files
committed
fix ip nullability
1 parent9003ae0 commitc1ae295

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4075,6 +4075,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40754075
AgentID:agent.ID,
40764076
AppID:app.ID,
40774077
UserID:u.ID,
4078+
Ip:"127.0.0.1",
40784079
}).Asserts(rbac.ResourceSystem,policy.ActionUpdate)
40794080
}))
40804081
s.Run("InsertWorkspaceAgentScriptTimings",s.Subtest(func(db database.Store,check*expects) {

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12284,7 +12284,7 @@ func (q *FakeQuerier) UpsertWorkspaceAppAuditSession(ctx context.Context, arg da
1228412284
ifs.UserID!=arg.UserID {
1228512285
continue
1228612286
}
12287-
ifs.Ip.IPNet.String()!=arg.Ip.IPNet.String() {
12287+
ifs.Ip!=arg.Ip {
1228812288
continue
1228912289
}
1229012290
ifs.UserAgent!=arg.UserAgent {

‎coderd/database/dump.sql

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/migrations/000301_add_workspace_app_audit_sessions.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CREATE UNLOGGED TABLE workspace_app_audit_sessions (
44
agent_id UUIDNOT NULL,
55
app_id UUIDNOT NULL,-- Can be NULL, but must be uuid.Nil.
66
user_id UUIDNOT NULL,-- Can be NULL, but must be uuid.Nil.
7-
ipinetNOT NULL,
7+
ipTEXTNOT NULL,
88
user_agentTEXTNOT NULL,
99
slug_or_portTEXTNOT NULL,
1010
status_code int4NOT NULL,

‎coderd/database/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/workspaceapps/db.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/go-jose/go-jose/v4/jwt"
1717
"github.com/google/uuid"
18-
"github.com/sqlc-dev/pqtype"
1918
"golang.org/x/xerrors"
2019

2120
"cdr.dev/slog"
@@ -367,7 +366,6 @@ func (p *DBTokenProvider) authorizeRequest(ctx context.Context, roles *rbac.Subj
367366

368367
typeauditRequeststruct {
369368
time time.Time
370-
ip pqtype.Inet
371369
apiKey*database.APIKey
372370
dbReq*databaseRequest
373371
}
@@ -389,7 +387,6 @@ func (p *DBTokenProvider) auditInitRequest(ctx context.Context, w http.ResponseW
389387

390388
aReq=&auditRequest{
391389
time:dbtime.Now(),
392-
ip:audit.ParseIP(r.RemoteAddr),
393390
}
394391

395392
// Set the commit function on the status writer to create an audit
@@ -412,6 +409,7 @@ func (p *DBTokenProvider) auditInitRequest(ctx context.Context, w http.ResponseW
412409
userID=aReq.apiKey.UserID
413410
}
414411
userAgent:=r.UserAgent()
412+
ip:=r.RemoteAddr
415413

416414
// Approximation of the status code.
417415
statusCode:=sw.Status
@@ -462,7 +460,7 @@ func (p *DBTokenProvider) auditInitRequest(ctx context.Context, w http.ResponseW
462460
AgentID:aReq.dbReq.Agent.ID,
463461
AppID:aReq.dbReq.App.ID,// Can be unset, in which case uuid.Nil is fine.
464462
UserID:userID,// Can be unset, in which case uuid.Nil is fine.
465-
Ip:aReq.ip,
463+
Ip:ip,
466464
UserAgent:userAgent,
467465
SlugOrPort:appInfo.SlugOrPort,
468466
StatusCode:int32(statusCode),
@@ -512,7 +510,7 @@ func (p *DBTokenProvider) auditInitRequest(ctx context.Context, w http.ResponseW
512510
RequestID:requestID,
513511
Time:aReq.time,
514512
Status:statusCode,
515-
IP:aReq.ip.IPNet.IP.String(),
513+
IP:ip,
516514
UserAgent:userAgent,
517515
New:aReq.dbReq.App,
518516
AdditionalFields:appInfoBytes,
@@ -529,7 +527,7 @@ func (p *DBTokenProvider) auditInitRequest(ctx context.Context, w http.ResponseW
529527
RequestID:requestID,
530528
Time:aReq.time,
531529
Status:statusCode,
532-
IP:aReq.ip.IPNet.IP.String(),
530+
IP:ip,
533531
UserAgent:userAgent,
534532
New:aReq.dbReq.Agent,
535533
AdditionalFields:appInfoBytes,

0 commit comments

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