Skip to content

Commit

Permalink
Merge pull request #1 from limsedan/fix/groups_and_graphql
Browse files Browse the repository at this point in the history
patch for v1.15.6 with graphql
  • Loading branch information
florian-forestier authored Mar 20, 2024
2 parents a9dd8b6 + 9a96efe commit d6294fb
Show file tree
Hide file tree
Showing 6 changed files with 1,610 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ build/
/vault.bin.tar.gz
/vault/
/data/

## Configuration for development ##
/configuration.json
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Vault Patches

Project who takes [HashiCorp Vault](https://github.com/hashicorp/vault/) sources, and add Gitlab interconnexion on it.
Project which takes [HashiCorp Vault](https://github.com/hashicorp/vault/) sources, and add Gitlab interconnexion on it.

> ***Warning*** : Before v1.15.6, policies had different name format.
> Before migration to v1.15.6, don't forget to duplicate all your policies with the new formatted names.
> After migration, you'll be able to remove old policies.
## Building the image

Expand Down Expand Up @@ -92,9 +96,9 @@ Basically, Vault will replace all non-alphanumeric characters from the group/pro
concatenate the user role after it. A few examples to fully understand it:

* A user have access to `group/project1` with role `maintainer`
* The matching policy will be named `group_project1_maintainer`.
* The matching policy will be named `group:project1:maintainer`.
* A user have access to `group-one/` with role `owner`, and `group-two/very/long/pa-th/project` with role `reporter`
* The matching policies will be named `group_one_owner` and `group_two_very_long_pa_th_project_reporter`
* The matching policies will be named `group_one:owner` and `group_two:very:long:pa_th:project:reporter`

Every matching Vault policy will be loaded to the user token.

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.5-bullseye as build
FROM golang:1.21.7-bullseye as build

RUN mkdir /builddir
WORKDIR /builddir
Expand Down
4 changes: 2 additions & 2 deletions docker/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"listener": [
{
"tcp": {
"tcp": {
"address": "0.0.0.0:8200",
"tls_disable": true
}
Expand All @@ -16,4 +16,4 @@
"default_lease_ttl": "168h",
"max_lease_ttl": "720h",
"ui": true
}
}
2 changes: 1 addition & 1 deletion patch.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

if [ -z "$1" ]; then
echo "ERROR : You must define a variable."
echo "ERROR : You must define a version."
exit 1
fi

Expand Down
Loading

0 comments on commit d6294fb

Please sign in to comment.