deblan/gitea-sonarqube-bot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow loading token value from file reference

Browse source 
Signed-off-by: Steven Kriegler <61625851+justusbunsi@users.noreply.github.com>
This commit is contained in:
justusbunsi 2021-06-21 11:30:02 +02:00
parent 4797d38c70
commit f84442009c
No known key found for this signature in database
GPG key ID: 990B348ECAC9C7DB
3 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/config.example.yaml
View file

@ -5,7 +5,10 @@ gitea:
# Created access token for the user that shall be used as bot account.
# User needs "Read project" permissions with access to "Pull Requests"
token: ""
token:
value: ""
# # or path to file containing the plain text secret
# file: /path/to/gitea/token
# If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
# request will be ignored.
@ -35,7 +38,10 @@ sonarqube:
# Created access token for the user that shall be used as bot account.
# User needs "Browse on project" permissions
token: ""
token:
value: ""
# # or path to file containing the plain text secret
# file: /path/to/sonarqube/token
# If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
# request will be ignored.

17
internal/settings/settings.go
View file

@ -69,7 +69,11 @@ func ApplyConfigDefaults() {
viper.SetDefault("sonarqube.projects", []string{})
}
func ReadSecretFile(file string) string {
func ReadSecretFile(file string, defaultValue string) (string) {
if file == "" {
return defaultValue
}
content, err := ioutil.ReadFile(file)
if err != nil {
panic(fmt.Errorf("Cannot read '%s' or it is no regular file. %w", file, err))
@ -99,11 +103,8 @@ func Load(configPath string) {
Gitea = fullConfig.Gitea
SonarQube = fullConfig.SonarQube
if Gitea.Webhook.SecretFile != "" {
Gitea.Webhook.Secret = ReadSecretFile(Gitea.Webhook.SecretFile)
}
if SonarQube.Webhook.SecretFile != "" {
SonarQube.Webhook.Secret = ReadSecretFile(SonarQube.Webhook.SecretFile)
}
Gitea.Webhook.Secret = ReadSecretFile(Gitea.Webhook.SecretFile, Gitea.Webhook.Secret)
Gitea.Token.Value = ReadSecretFile(Gitea.Token.File, Gitea.Token.Value)
SonarQube.Webhook.Secret = ReadSecretFile(SonarQube.Webhook.SecretFile, SonarQube.Webhook.Secret)
SonarQube.Token.Value = ReadSecretFile(SonarQube.Token.File, SonarQube.Token.Value)
}

38
internal/settings/settings_test.go
View file

@ -146,35 +146,44 @@ func TestLoadSonarQubeStructureInjectedEnvs(t *testing.T) {
}
func TestLoadStructureWithFileReferenceResolving(t *testing.T) {
giteaSecretFile := path.Join(os.TempDir(), "webhook-secret-gitea")
sonarqubeSecretFile := path.Join(os.TempDir(), "webhook-secret-sonarqube")
giteaWebhookSecretFile := path.Join(os.TempDir(), "webhook-secret-gitea")
_ = ioutil.WriteFile(giteaWebhookSecretFile, []byte(`gitea-totally-secret`),0444)
_ = ioutil.WriteFile(giteaSecretFile, []byte(`gitea-totally-secret`),0444)
_ = ioutil.WriteFile(sonarqubeSecretFile, []byte(`sonarqube-totally-secret`),0444)
giteaTokenFile := path.Join(os.TempDir(), "token-secret-gitea")
_ = ioutil.WriteFile(giteaTokenFile, []byte(`d0fcdeb5eaa99c506831f9eb4e63fc7cc484a565`),0444)
sonarqubeWebhookSecretFile := path.Join(os.TempDir(), "webhook-secret-sonarqube")
_ = ioutil.WriteFile(sonarqubeWebhookSecretFile, []byte(`sonarqube-totally-secret`),0444)
sonarqubeTokenFile := path.Join(os.TempDir(), "token-secret-sonarqube")
_ = ioutil.WriteFile(sonarqubeTokenFile, []byte(`a09eb5785b25bb2cbacf48808a677a0709f02d8e`),0444)
WriteConfigFile(t, []byte(
`gitea:
url: https://example.com/gitea
token:
value: d0fcdeb5eaa99c506831f9eb4e63fc7cc484a565
value: fake-gitea-token
repositories: []
sonarqube:
url: https://example.com/sonarqube
token:
value: a09eb5785b25bb2cbacf48808a677a0709f02d8e
value: fake-sonarqube-token
projects: []
`))
os.Setenv("PRBOT_GITEA_WEBHOOK_SECRETFILE", giteaSecretFile)
os.Setenv("PRBOT_SONARQUBE_WEBHOOK_SECRETFILE", sonarqubeSecretFile)
os.Setenv("PRBOT_GITEA_WEBHOOK_SECRETFILE", giteaWebhookSecretFile)
os.Setenv("PRBOT_GITEA_TOKEN_FILE", giteaTokenFile)
os.Setenv("PRBOT_SONARQUBE_WEBHOOK_SECRETFILE", sonarqubeWebhookSecretFile)
os.Setenv("PRBOT_SONARQUBE_TOKEN_FILE", sonarqubeTokenFile)
expectedGitea := GiteaConfig{
Url: "https://example.com/gitea",
Token: Token{
Value: "d0fcdeb5eaa99c506831f9eb4e63fc7cc484a565",
File: giteaTokenFile,
},
Webhook: Webhook{
Secret: "gitea-totally-secret",
SecretFile: giteaSecretFile,
SecretFile: giteaWebhookSecretFile,
},
Repositories: []GiteaRepository{},
}
@ -183,10 +192,11 @@ sonarqube:
Url: "https://example.com/sonarqube",
Token: Token{
Value: "a09eb5785b25bb2cbacf48808a677a0709f02d8e",
File: sonarqubeTokenFile,
},
Webhook: Webhook{
Secret: "sonarqube-totally-secret",
SecretFile: sonarqubeSecretFile,
SecretFile: sonarqubeWebhookSecretFile,
},
Projects: []string{},
}
@ -196,9 +206,13 @@ sonarqube:
assert.EqualValues(t, expectedSonarQube, SonarQube)
t.Cleanup(func() {
os.Remove(giteaSecretFile)
os.Remove(sonarqubeSecretFile)
os.Remove(giteaWebhookSecretFile)
os.Remove(giteaTokenFile)
os.Remove(sonarqubeWebhookSecretFile)
os.Remove(sonarqubeTokenFile)
os.Unsetenv("PRBOT_GITEA_WEBHOOK_SECRETFILE")
os.Unsetenv("PRBOT_GITEA_TOKEN_FILE")
os.Unsetenv("PRBOT_SONARQUBE_WEBHOOK_SECRETFILE")
os.Unsetenv("PRBOT_SONARQUBE_TOKEN_FILE")
})
}