Skip to content

[#1237] Event Logging Updates #1358

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 10, 2020
Merged

[#1237] Event Logging Updates #1358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bffdc70
[#1237] Event Logging Updates
dealako Jul 10, 2020
46b2037
Merge branch 'master' into feature/event-log-updates
dealako Jul 10, 2020
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
29 changes: 15 additions & 14 deletions cla-backend-go/cla_manager/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := buildErrorMessageForDelete(params, sigErr)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerRequestBadRequest().WithPayload(&models.ErrorResponse{
Message: "CLA Manager Delete Request - error reading CCLA Signatures - " + msg,
Message: "EasyCLA - 400 Bad Request - CLA Manager Delete Request - error reading CCLA Signatures - " + msg,
Code: "400",
})
}
Expand All @@ -505,7 +505,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
sigModel := sigModels.Signatures[0]
claManagers := sigModel.SignatureACL
if !currentUserInACL(claUser, claManagers) {
msg := fmt.Sprintf("CLA Manager %s / %s / %s not authorized to delete requests for company ID: %s, project ID: %s",
msg := fmt.Sprintf("EasyCLA - 401 Unauthorized - CLA Manager %s / %s / %s not authorized to delete requests for company ID: %s, project ID: %s",
claUser.UserID, claUser.Name, claUser.LFEmail, params.CompanyID, params.ProjectID)
log.Debug(msg)
return cla_manager.NewDeleteCLAManagerRequestUnauthorized().WithPayload(&models.ErrorResponse{
Expand Down Expand Up @@ -553,7 +553,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for user by LFID: %s failed ", params.Body.UserLFID)
log.Warn(msg)
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Add CLA Manager - error getting user - " + msg,
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting user - " + msg,
Code: "400",
})
}
Expand All @@ -562,7 +562,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for company by ID: %s failed ", params.CompanyID)
log.Warn(msg)
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Add CLA Manager - error getting company - " + msg,
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting company - " + msg,
Code: "400",
})
}
Expand All @@ -572,7 +572,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for project by ID: %s failed ", params.ProjectID)
log.Warn(msg)
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Add CLA Manager - error getting project - " + msg,
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting project - " + msg,
Code: "400",
})
}
Expand All @@ -589,7 +589,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := buildErrorMessageAddManager("Add CLA Manager - signature lookup error", params, sigErr)
log.Warn(msg)
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Add CLA Manager - error reading CCLA Signatures - " + msg,
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error reading CCLA Signatures - " + msg,
Code: "400",
})
}
Expand All @@ -601,7 +601,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
sigModel := sigModels.Signatures[0]
claManagers := sigModel.SignatureACL
if !currentUserInACL(claUser, claManagers) {
msg := fmt.Sprintf("User %s / %s / %s is not authorized to add a CLA Manager for company ID: %s, project ID: %s",
msg := fmt.Sprintf("EasyCLA - 401 Unauthorized - User %s / %s / %s is not authorized to add a CLA Manager for company ID: %s, project ID: %s",
claUser.UserID, claUser.Name, claUser.LFEmail, params.CompanyID, params.ProjectID)
log.Debug(msg)
return cla_manager.NewAddCLAManagerUnauthorized().WithPayload(&models.ErrorResponse{
Expand All @@ -610,8 +610,8 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
})
}

// Audit Event sent from service upon success
signature, addErr := service.AddClaManager(params.CompanyID, params.ProjectID, params.Body.UserLFID)

if addErr != nil {
msg := buildErrorMessageAddManager("Add CLA Manager - Service Error", params, addErr)
log.Warn(msg)
Expand All @@ -632,7 +632,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for user by LFID: %s failed ", params.UserLFID)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Delete CLA Manager - error getting user - " + msg,
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting user - " + msg,
Code: "400",
})
}
Expand All @@ -641,7 +641,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for company by ID: %s failed ", params.CompanyID)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Delete CLA Manager - error getting company - " + msg,
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting company - " + msg,
Code: "400",
})
}
Expand All @@ -651,7 +651,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := fmt.Sprintf("User lookup for project by ID: %s failed ", params.ProjectID)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Delete CLA Manager - error getting project - " + msg,
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting project - " + msg,
Code: "400",
})
}
Expand All @@ -667,7 +667,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Signature Lookup Error", params, sigErr)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: "Delete CLA Manager - error reading CCLA Signatures - " + msg,
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error reading CCLA Signatures - " + msg,
Code: "400",
})
}
Expand All @@ -688,10 +688,11 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
})
}

// Audit Event sent from service upon success
signature, deleteErr := service.RemoveClaManager(params.CompanyID, params.ProjectID, params.UserLFID)

if deleteErr != nil {
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Service Error", params, deleteErr)
msg := buildErrorMessageDeleteManager("EasyCLA - 400 Bad Request - Delete CLA Manager - Service Error", params, deleteErr)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: msg,
Expand All @@ -700,7 +701,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
}

if signature == nil {
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Response Signature Missing", params, deleteErr)
msg := buildErrorMessageDeleteManager("EasyCLA - 400 Bad Request - Delete CLA Manager - Response Signature Missing", params, deleteErr)
log.Warn(msg)
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
Message: msg,
Expand Down
8 changes: 5 additions & 3 deletions cla-backend-go/cla_manager/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,11 @@ func (s service) AddClaManager(companyID string, projectID string, LFID string)
UserModel: userModel,
ExternalProjectID: projectModel.ProjectExternalID,
EventData: &events.CLAManagerCreatedEventData{
UserName: userModel.Username,
UserEmail: userModel.LfEmail,
UserLFID: userModel.LfUsername,
CompanyName: companyModel.CompanyName,
ProjectName: projectModel.ProjectName,
UserName: userModel.Username,
UserEmail: userModel.LfEmail,
UserLFID: userModel.LfUsername,
},
})

Expand Down
Loading