Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub proxy: git command recorder #50505

Merged
merged 5 commits into from
Jan 14, 2025
Merged

Conversation

greedy52
Copy link
Contributor

@greedy52 greedy52 added the no-changelog Indicates that a PR does not require a changelog entry label Dec 20, 2024
@greedy52 greedy52 self-assigned this Dec 20, 2024
lib/srv/git/audit.go Outdated Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
lib/srv/git/audit.go Outdated Show resolved Hide resolved
lib/srv/git/audit.go Show resolved Hide resolved
lib/srv/git/audit.go Outdated Show resolved Hide resolved
@greedy52 greedy52 mentioned this pull request Jan 2, 2025
9 tasks
lib/srv/git/audit.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@r0mant r0mant left a comment

Choose a reason for hiding this comment

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

lgtm with a few comments

lib/srv/git/audit.go Outdated Show resolved Hide resolved
lib/srv/git/audit.go Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
lib/srv/git/command.go Outdated Show resolved Hide resolved
return &Command{
SSHCommand: sshCommand,
Service: args[0],
Repository: Repository(args[1]),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we strip .git suffix from the path? Same below.

Copy link
Contributor Author

@greedy52 greedy52 Jan 14, 2025

Choose a reason for hiding this comment

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

since this is the repository path at git level, i think we should keep the original path with the suffix. If we need to extract <github-org>, <github-repo> from this path, we can do it separately.

@greedy52 greedy52 enabled auto-merge January 14, 2025 17:52
@greedy52 greedy52 added this pull request to the merge queue Jan 14, 2025
Merged via the queue into master with commit 95c1697 Jan 14, 2025
43 checks passed
@greedy52 greedy52 deleted the STeve/48762_audit_and_command branch January 14, 2025 18:14
greedy52 added a commit that referenced this pull request Jan 15, 2025
* GitHub proxy: recording git command

* address review

* review comments

* allow flags after repository for git-upload-pack
greedy52 added a commit that referenced this pull request Jan 16, 2025
* GitHub proxy: recording git command

* address review

* review comments

* allow flags after repository for git-upload-pack
github-merge-queue bot pushed a commit that referenced this pull request Jan 16, 2025
* GitHub Proxy part 1: github integration resource (#48999)

* github integration resource

* fix lib/web

* revert withSecrets

* use static credentials

* address review comments

* fix ut

* GitHub Proxy part 2: git_server resource, service, and RBAC (#49393)

* git_server resource and role.allow.github_permissions

* implicit RO on KindGitServer

* review comments

* fix ut

* make -C integrations/operator crd

* fix ut again

* make crds-up-to-date and make -C integrations/terraform docs

* GitHub proxy part 1.5: integration in web ui (#49561)

* GitHub proxy part 1.5: integration in web ui

* fix lint

* GitHub Proxy part 3.5: caching PluginStaticCredentials (#49472)

* GitHub Proxy part 3.5: caching PluginStaticCredentials

* fix lint

* GitHub proxy part 2.5: git_server cache (#49564)

* GitHub proxy part 2.5: git_server cache

* revert event

* fix getAll

* review comments

* GitHub Proxy part 3: gen github user cert and export CA (#49396)

* GitHub Proxy part 3: gen github user cert and export CA

* address pr comment

* minor refactor

* use cache

* fix build and cache

* GitHub proxy part 4: `tsh git ls` with unified resource (#49596)

* GitHub proxy part 4: tsh git ls

* fix ut

* update username note

* fix

* GitHub proxy part 5: OAuth flow to retrieve GitHub identity (#49849)

* GitHub proxy part 5: OAuth flow to retrieve GitHub identity

* review comments round1

* review comments round 2 and update tsh git list

* make -C integrations/operator crd

* make -C integrations/terraform docs

* fix flaky test

* GitHub proxy part 6.5: tsh git ssh/clone/config (#50044)

* GitHub proxy part 6.5: tsh git ssh/clone/config

* review comments

* fix test

* fix ut for lookpath

* fix logger and update dependency version

* go mod tidy for integrations

* GitHub proxy part 7: audit events (#49923)

* GitHub proxy part 7: audit events

* make Git Command consistent

* fix typo

* GitHub proxy: git command recorder (#50505)

* GitHub proxy: recording git command

* address review

* review comments

* allow flags after repository for git-upload-pack

* GitHub proxy part 6: proxing Git using SSH transport (#49980)

* GitHub proxy part 6: proxing Git using SSH transport

* better command parsing and update suite

* refactor

* revert unnecearrty files

* address review comments

* ut fix

* revert localsite_test.go

* change special suffix to teleport-github-org for routing

* fix routing ut

* minor typo edit

* fix ut after sshca change

* add UT to sshutils

* minor review comments

* fix api ut because of special suffix change

* GitServerReadOnlyClient

* downgrade error to warning

* run go mod tidy. not sure why it's needed

* rename mock.go to mock_test.go

* GitHub Proxy: complete audit event flow and add an enterprise guard (#51049)

* fix lint and remove accidently checked-in binary

* Fix flaky git.TestForwardServer test (#51112)
mvbrock pushed a commit that referenced this pull request Jan 18, 2025
* GitHub proxy: recording git command

* address review

* review comments

* allow flags after repository for git-upload-pack
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog Indicates that a PR does not require a changelog entry size/md
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants