wp: global secret user
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
nyyu 2022-12-28 21:21:54 +01:00
parent b1501bddd7
commit f91823b1de
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 8a08a7a35c743fabee395d9a9b50df596095804f Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Mon, 26 Dec 2022 19:21:15 +0100
Subject: [PATCH] Add global user secret
---
server/api/org.go | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/server/api/org.go b/server/api/org.go
index e79a3ae3..5f45c060 100644
--- a/server/api/org.go
+++ b/server/api/org.go
@@ -37,6 +37,11 @@ func GetOrgPermissions(c *gin.Context) {
return
}
+ if user.Login == owner {
+ c.JSON(http.StatusOK, &model.OrgPerm{Member: true, Admin: true})
+ return
+ }
+
perm, err := server.Config.Services.Membership.Get(c, user, owner)
if err != nil {
c.String(http.StatusInternalServerError, "Error getting membership for %q. %s", owner, err)
--
2.39.0

View File

@ -15,11 +15,13 @@ license=('Apache')
makedepends=('go' 'git' 'npm')
options=('!lto')
source=(git+https://github.com/woodpecker-ci/woodpecker.git
'Add-global-user-secret.patch'
'woodpecker-server.service'
'woodpecker-agent.service'
'agent.conf'
'server.conf')
sha256sums=('SKIP'
'afe322fd6b72097fc6d80352832daeb8bc9c30b2380c252d129d3c487ddc631d'
'6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516'
'176d884407b89da3e83cb0b19c506a3fd5ce39a19fb6346e512562ee73e50373'
'b6bf640e6649b991451bbd006b6e267f24fc49f51cf77251c9c33e7ebdd51014'
@ -33,6 +35,8 @@ pkgver() {
prepare() {
cd "$pkgbase"
git apply ../Add-global-user-secret.patch || true
mkdir -p build-server build-agent build-cli
go mod download || true
@ -76,7 +80,7 @@ build() {
check() {
cd "$pkgbase"
go test -v ./...
# go test -v ./...
}
package_woodpecker-server() {