Skip to content

Commit 2ff9802

Browse files
authored
Merge branch 'main' into improve-auth-test-coverage
2 parents ecb83cc + 6f7032f commit 2ff9802

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2705
-769
lines changed

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
with:
2222
comment-summary-in-pr: always
2323
fail-on-severity: high
24-
allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, Zlib
24+
allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, OFL-1.1, Zlib
2525
fail-on-scopes: development, runtime
2626
allow-dependencies-licenses: 'pkg:npm/caniuse-lite'

.husky/commit-msg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
npx --no -- commitlint --edit ${1} && npm run lint

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<a href="https://github.com/finos/git-proxy">
44
<img src="./docs/img/logo.png" alt="Logo" height="95">
55
</a>
6-
6+
77
<br />
88
<br />
9-
9+
1010
<p align="center">
1111
Deploy custom push protections and policies<br />on top of Git
1212
<br />

config.schema.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@
103103
}
104104
}
105105
},
106+
"apiAuthentication": {
107+
"description": "List of authentication sources for API endpoints. May be empty, in which case all endpoints are public.",
108+
"type": "array",
109+
"items": {
110+
"$ref": "#/definitions/authentication"
111+
}
112+
},
106113
"tls": {
107114
"description": "TLS configuration for secure connections",
108115
"type": "object",
@@ -124,6 +131,19 @@
124131
"description": "Configuration source"
125132
}
126133
}
134+
},
135+
"uiRouteAuth": {
136+
"description": "UI routes that require authentication (logged in or admin)",
137+
"type": "object",
138+
"properties": {
139+
"enabled": { "type": "boolean" },
140+
"rules": {
141+
"type": "array",
142+
"items": {
143+
"$ref": "#/definitions/routeAuthRule"
144+
}
145+
}
146+
}
127147
}
128148
},
129149
"definitions": {
@@ -155,6 +175,14 @@
155175
"options": { "type": "object" }
156176
},
157177
"required": ["type", "enabled"]
178+
},
179+
"routeAuthRule": {
180+
"type": "object",
181+
"properties": {
182+
"pattern": { "type": "string" },
183+
"adminOnly": { "type": "boolean" },
184+
"loginRequired": { "type": "boolean" }
185+
}
158186
}
159187
},
160188
"additionalProperties": false

package-lock.json

Lines changed: 177 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)