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

fix: fill out zero-value user properties in /audit#13604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
code-asher merged 1 commit intomainfromasher/missing-user-timestamp
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletionscoderd/audit.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ import (
"github.com/coder/coder/v2/coderd/database/db2sdk"
"github.com/coder/coder/v2/coderd/httpapi"
"github.com/coder/coder/v2/coderd/httpmw"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/searchquery"
"github.com/coder/coder/v2/codersdk"
)
Expand DownExpand Up@@ -183,27 +182,26 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
_=json.Unmarshal(dblog.Diff,&diff)

varuser*codersdk.User

ifdblog.UserUsername.Valid {
user=&codersdk.User{
ReducedUser: codersdk.ReducedUser{
MinimalUser: codersdk.MinimalUser{
ID:dblog.UserID,
Username:dblog.UserUsername.String,
AvatarURL:dblog.UserAvatarUrl.String,
},
Email:dblog.UserEmail.String,
CreatedAt:dblog.UserCreatedAt.Time,
Status:codersdk.UserStatus(dblog.UserStatus.UserStatus),
},
Roles: []codersdk.SlimRole{},
}

for_,input:=rangedblog.UserRoles {
roleName,_:=rbac.RoleNameFromString(input)
rbacRole,_:=rbac.RoleByName(roleName)
user.Roles=append(user.Roles,db2sdk.SlimRole(rbacRole))
}
// Leaving the organization IDs blank for now; not sure they are useful for
// the audit query anyway?
sdkUser:=db2sdk.User(database.User{
ID:dblog.UserID,
Email:dblog.UserEmail.String,
Username:dblog.UserUsername.String,
CreatedAt:dblog.UserCreatedAt.Time,
UpdatedAt:dblog.UserUpdatedAt.Time,
Status:dblog.UserStatus.UserStatus,
RBACRoles:dblog.UserRoles,
LoginType:dblog.UserLoginType.LoginType,
AvatarURL:dblog.UserAvatarUrl.String,
Deleted:dblog.UserDeleted.Bool,
LastSeenAt:dblog.UserLastSeenAt.Time,
QuietHoursSchedule:dblog.UserQuietHoursSchedule.String,
ThemePreference:dblog.UserThemePreference.String,
Name:dblog.UserName.String,
}, []uuid.UUID{})
user=&sdkUser
}

var (
Expand Down
51 changes: 51 additions & 0 deletionscoderd/audit_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,11 +8,13 @@ import (
"testing"
"time"

"github.com/google/uuid"
"github.com/stretchr/testify/require"

"github.com/coder/coder/v2/coderd/audit"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/codersdk"
)

Expand DownExpand Up@@ -42,6 +44,55 @@ func TestAuditLogs(t *testing.T) {
require.Len(t,alogs.AuditLogs,1)
})

t.Run("User",func(t*testing.T) {
t.Parallel()

ctx:=context.Background()
client:=coderdtest.New(t,nil)
user:=coderdtest.CreateFirstUser(t,client)
client2,user2:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID,rbac.RoleOwner())

err:=client2.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
ResourceID:user2.ID,
})
require.NoError(t,err)

alogs,err:=client.AuditLogs(ctx, codersdk.AuditLogsRequest{
Pagination: codersdk.Pagination{
Limit:1,
},
})
require.NoError(t,err)
require.Equal(t,int64(1),alogs.Count)
require.Len(t,alogs.AuditLogs,1)

// Make sure the returned user is fully populated.
foundUser,err:=client.User(ctx,user2.ID.String())
foundUser.OrganizationIDs= []uuid.UUID{}// Not included.
require.NoError(t,err)
require.Equal(t,foundUser,*alogs.AuditLogs[0].User)

// Delete the user and try again. This is a soft delete so nothing should
// change. If users are hard deleted we should get nil, but there is no way
// to test this at the moment.
err=client.DeleteUser(ctx,user2.ID)
require.NoError(t,err)

alogs,err=client.AuditLogs(ctx, codersdk.AuditLogsRequest{
Pagination: codersdk.Pagination{
Limit:1,
},
})
require.NoError(t,err)
require.Equal(t,int64(1),alogs.Count)
require.Len(t,alogs.AuditLogs,1)

foundUser,err=client.User(ctx,user2.ID.String())
foundUser.OrganizationIDs= []uuid.UUID{}// Not included.
require.NoError(t,err)
require.Equal(t,foundUser,*alogs.AuditLogs[0].User)
})

t.Run("WorkspaceBuildAuditLink",func(t*testing.T) {
t.Parallel()

Expand Down
47 changes: 27 additions & 20 deletionscoderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1969,26 +1969,33 @@ func (q *FakeQuerier) GetAuditLogsOffset(_ context.Context, arg database.GetAudi
userValid := err == nil

logs = append(logs, database.GetAuditLogsOffsetRow{
ID: alog.ID,
RequestID: alog.RequestID,
OrganizationID: alog.OrganizationID,
Ip: alog.Ip,
UserAgent: alog.UserAgent,
ResourceType: alog.ResourceType,
ResourceID: alog.ResourceID,
ResourceTarget: alog.ResourceTarget,
ResourceIcon: alog.ResourceIcon,
Action: alog.Action,
Diff: alog.Diff,
StatusCode: alog.StatusCode,
AdditionalFields: alog.AdditionalFields,
UserID: alog.UserID,
UserUsername: sql.NullString{String: user.Username, Valid: userValid},
UserEmail: sql.NullString{String: user.Email, Valid: userValid},
UserCreatedAt: sql.NullTime{Time: user.CreatedAt, Valid: userValid},
UserStatus: database.NullUserStatus{UserStatus: user.Status, Valid: userValid},
UserRoles: user.RBACRoles,
Count: 0,
ID: alog.ID,
RequestID: alog.RequestID,
OrganizationID: alog.OrganizationID,
Ip: alog.Ip,
UserAgent: alog.UserAgent,
ResourceType: alog.ResourceType,
ResourceID: alog.ResourceID,
ResourceTarget: alog.ResourceTarget,
ResourceIcon: alog.ResourceIcon,
Action: alog.Action,
Diff: alog.Diff,
StatusCode: alog.StatusCode,
AdditionalFields: alog.AdditionalFields,
UserID: alog.UserID,
UserUsername: sql.NullString{String: user.Username, Valid: userValid},
UserName: sql.NullString{String: user.Name, Valid: userValid},
UserEmail: sql.NullString{String: user.Email, Valid: userValid},
UserCreatedAt: sql.NullTime{Time: user.CreatedAt, Valid: userValid},
UserUpdatedAt: sql.NullTime{Time: user.UpdatedAt, Valid: userValid},
UserLastSeenAt: sql.NullTime{Time: user.LastSeenAt, Valid: userValid},
UserLoginType: database.NullLoginType{LoginType: user.LoginType, Valid: userValid},
UserDeleted: sql.NullBool{Bool: user.Deleted, Valid: userValid},
UserThemePreference: sql.NullString{String: user.ThemePreference, Valid: userValid},
UserQuietHoursSchedule: sql.NullString{String: user.QuietHoursSchedule, Valid: userValid},
UserStatus: database.NullUserStatus{UserStatus: user.Status, Valid: userValid},
UserRoles: user.RBACRoles,
Count: 0,
})

if len(logs) >= int(arg.Limit) {
Expand Down
67 changes: 45 additions & 22 deletionscoderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

9 changes: 9 additions & 0 deletionscoderd/database/queries/auditlogs.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,21 @@
-- name: GetAuditLogsOffset :many
SELECT
audit_logs.*,
-- sqlc.embed(users) would be nice but it does not seem to play well with
-- left joins.
Comment on lines +6 to +7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

users.usernameAS user_username,
users.nameAS user_name,
users.emailAS user_email,
users.created_atAS user_created_at,
users.updated_atAS user_updated_at,
users.last_seen_atAS user_last_seen_at,
users.statusAS user_status,
users.login_typeAS user_login_type,
users.rbac_rolesAS user_roles,
users.avatar_urlAS user_avatar_url,
users.deletedAS user_deleted,
users.theme_preferenceAS user_theme_preference,
users.quiet_hours_scheduleAS user_quiet_hours_schedule,
COUNT(audit_logs.*) OVER ()AS count
FROM
audit_logs
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp