This repository was archived by the owner on Sep 30, 2024. It is now read-only.
feat: implement functionality to create credential GitHub apps#63635
Merged
Conversation
Comment on lines
+7
to
+9
| "github.com/sourcegraph/sourcegraph/internal/batches/sources" | ||
| ghstore "github.com/sourcegraph/sourcegraph/internal/github_apps/store" | ||
| "github.com/sourcegraph/sourcegraph/lib/pointers" |
Contributor
There was a problem hiding this comment.
These imports aren't properly sorted.
It's one of the weirdness I encountered with Goland, I haven't found a way to integrate golangci-lint.
Contributor
Author
There was a problem hiding this comment.
I'm wondering what the source (or tool) of truth is. I just ran sg lint --fix format and that didn't update imports.
Contributor
There was a problem hiding this comment.
Yeah, golangci-lint is what usually does this on vscode, but I haven't found a way to do it on GoLand.
Contributor
There was a problem hiding this comment.
BolajiOlajide
suggested changes
Jul 4, 2024
| } | ||
|
|
||
| redirectURL := generateRedirectURL(&stateDetails.Domain, &installationID, &app.ID, &app.Name, nil) | ||
| if kind == ghtypes.UserCredentialGitHubAppKind { |
Contributor
There was a problem hiding this comment.
You'll need to replicate this for Site Credentials, this only works for user credentials right now.
Contributor
Author
There was a problem hiding this comment.
Done, but not tested (apart from existing CI)
Comment on lines
+1890
to
+1920
| // 🚨 SECURITY: Check that a site credential can only be created | ||
| // by a site-admin. | ||
| if err := auth.CheckCurrentUserIsSiteAdmin(ctx, s.store.DatabaseDB()); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if as == "" { | ||
| return nil, errors.New("authentication strategy must be specified") | ||
| } | ||
|
|
||
| // Throw error documented in schema.graphql. | ||
| existing, err := s.store.GetSiteCredential(ctx, store.GetSiteCredentialOpts{ | ||
| ExternalServiceType: args.ExternalServiceType, | ||
| ExternalServiceID: args.ExternalServiceURL, | ||
| }) | ||
| if err != nil && err != store.ErrNoResults { | ||
| return nil, err | ||
| } | ||
| if existing != nil { | ||
| return nil, ErrDuplicateCredential{} | ||
| } | ||
|
|
||
| a, err := s.generateAuthenticatorForCredential(ctx, generateAuthenticatorForCredentialArgs{ | ||
| externalServiceType: args.ExternalServiceType, | ||
| externalServiceURL: args.ExternalServiceURL, | ||
| credential: args.Credential, | ||
| username: args.Username, | ||
| gitHubAppKind: args.GitHubAppKind, | ||
| githubAppID: args.GitHubAppID, | ||
| authenticationStrategy: as, | ||
| githubAppStore: s.store.GitHubAppsStore(), |
Check notice
Code scanning / Semgrep OSS
Semgrep Finding: security-semgrep-rules.semgrep-rules.generic.comment-tagging-rule
BolajiOlajide
approved these changes
Jul 5, 2024
BolajiOlajide
left a comment
Contributor
There was a problem hiding this comment.
Just a couple of comments and this should be good to go.
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
BolajiOlajide
approved these changes
Jul 5, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes SRCH-663
This is a follow-up to previous PRs, where we added database fields to support the new github apps integration.
See initiative "Batch Changes using GitHub App auth" on linear.
Test plan
Changelog