merith-tk/forgejo-runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Allow request an insecure gitea server (#18)

Browse source 
When deploy a Gitea server with a self-signed HTTPS certification. Runner will be failed when connect to Gitea server. This PR will fix that to allow ignore the HTTPS certification verification.

Reviewed-on: https://gitea.com/gitea/act_runner/pulls/18
Reviewed-by: Jason Song <i@wolfogre.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Lunny Xiao 2023-02-15 16:51:14 +08:00 • committed by Jason Song
parent 990cf93c71
commit f1869f70b9
8 changed files with 66 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/config.go
View file

@ -5,6 +5,7 @@ import (
"io"
"os"
"runtime"
"strconv"
"gitea.com/gitea/act_runner/core"
@ -23,7 +24,8 @@ type (
}
Client struct {
Address string `ignored:"true"`
Address string `ignored:"true"`
Insecure bool
}
Runner struct {
@ -51,7 +53,8 @@ func FromEnviron() (Config, error) {
}
// check runner config exist
if f, err := os.Stat(cfg.Runner.File); err == nil && !f.IsDir() {
f, err := os.Stat(cfg.Runner.File)
if err == nil && !f.IsDir() {
jsonFile, _ := os.Open(cfg.Runner.File)
defer jsonFile.Close()
byteValue, _ := io.ReadAll(jsonFile)
@ -71,6 +74,11 @@ func FromEnviron() (Config, error) {
if runner.Address != "" {
cfg.Client.Address = runner.Address
}
if runner.Insecure != "" {
cfg.Client.Insecure, _ = strconv.ParseBool(runner.Insecure)
}
} else if err != nil {
return cfg, err
}
// runner config