github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-04-15 01:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix repo access (#476) (#477)

Browse Source 
Backport #476

* fix repo access

* fix permission syncing

Co-authored-by: Anbraten <anton@ju60.de>
This commit is contained in:
6543
2021-10-26 23:27:05 +02:00
committed by GitHub
co-authored by Anbraten
parent f585b23811
commit 3af5f99fb2
18 changed files with 276 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
store/datastore/sql/postgres/files/feed.sql
+2
View File
@@ -26,6 +26,7 @@ FROM repos LEFT OUTER JOIN (
) b ON b.build_repo_id = repos.repo_id
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
AND repos.repo_active = TRUE
ORDER BY repo_full_name ASC;
@@ -55,5 +56,6 @@ FROM repos
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
INNER JOIN builds ON builds.build_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
ORDER BY build_id DESC
LIMIT 50
store/datastore/sql/postgres/files/repos.sql
+29
View File
@@ -36,6 +36,35 @@ INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
ORDER BY repo_full_name ASC
-- name: repo-find-user-owned
SELECT
repo_id
,repo_user_id
,repo_owner
,repo_name
,repo_full_name
,repo_avatar
,repo_link
,repo_clone
,repo_branch
,repo_timeout
,repo_private
,repo_trusted
,repo_active
,repo_allow_pr
,repo_hash
,repo_scm
,repo_config_path
,repo_gated
,repo_visibility
,repo_counter
FROM repos
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
ORDER BY repo_full_name ASC
-- name: repo-insert-ignore
INSERT INTO repos (
store/datastore/sql/postgres/sql_gen.go
+32
View File
@@ -36,6 +36,7 @@ var index = map[string]string{
"registry-delete": registryDelete,
"repo-update-counter": repoUpdateCounter,
"repo-find-user": repoFindUser,
"repo-find-user-owned": repoFindUserOwned,
"repo-insert-ignore": repoInsertIgnore,
"repo-delete": repoDelete,
"secret-find-repo": secretFindRepo,
@@ -132,6 +133,7 @@ FROM repos LEFT OUTER JOIN (
) b ON b.build_repo_id = repos.repo_id
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
AND repos.repo_active = TRUE
ORDER BY repo_full_name ASC;
`
@@ -161,6 +163,7 @@ FROM repos
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
INNER JOIN builds ON builds.build_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
ORDER BY build_id DESC
LIMIT 50
`
@@ -458,6 +461,35 @@ WHERE perms.perm_user_id = $1
ORDER BY repo_full_name ASC
`
var repoFindUserOwned = `
SELECT
repo_id
,repo_user_id
,repo_owner
,repo_name
,repo_full_name
,repo_avatar
,repo_link
,repo_clone
,repo_branch
,repo_timeout
,repo_private
,repo_trusted
,repo_active
,repo_allow_pr
,repo_hash
,repo_scm
,repo_config_path
,repo_gated
,repo_visibility
,repo_counter
FROM repos
INNER JOIN perms ON perms.perm_repo_id = repos.repo_id
WHERE perms.perm_user_id = $1
AND (perms.perm_push = true OR perms.perm_admin = true)
ORDER BY repo_full_name ASC
`
var repoInsertIgnore = `
INSERT INTO repos (
repo_user_id