actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2025-12-15 05:37:36 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

feature: Add --insecure flag for ignoring tls errors

Browse Source
This commit is contained in:
Danila Gudim 2025-12-05 15:31:35 +02:00 committed by Manuel Rüger
parent be4ff0d58a
commit b36d7aa135
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
confluence/api.go
View File

@ -2,6 +2,7 @@ package confluence
import ( import (
"bytes" "bytes"
"crypto/tls"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
@ -97,7 +98,7 @@ func (tracer *tracer) Printf(format string, args ...interface{}) {
log.Tracef(nil, tracer.prefix+" "+format, args...) log.Tracef(nil, tracer.prefix+" "+format, args...)
} }
func NewAPI(baseURL string, username string, password string) *API { func NewAPI(baseURL string, username string, password string, insecure bool) *API {
var auth *gopencils.BasicAuth var auth *gopencils.BasicAuth
if username != "" { if username != "" {
auth = &gopencils.BasicAuth{ auth = &gopencils.BasicAuth{
@ -105,7 +106,19 @@ func NewAPI(baseURL string, username string, password string) *API {
Password: password, Password: password,
} }
} }
rest := gopencils.Api(baseURL+"/rest/api", auth, 3) // set option for 3 retries on failure
var httpClient *http.Client
if insecure {
httpClient = &http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
}
}
rest := gopencils.Api(baseURL+"/rest/api", auth, httpClient, 3) // set option for 3 retries on failure
if username == "" { if username == "" {
if rest.Headers == nil { if rest.Headers == nil {
rest.Headers = http.Header{} rest.Headers = http.Header{}
@ -113,7 +126,7 @@ func NewAPI(baseURL string, username string, password string) *API {
rest.SetHeader("Authorization", fmt.Sprintf("Bearer %s", password)) rest.SetHeader("Authorization", fmt.Sprintf("Bearer %s", password))
} }
json := gopencils.Api(baseURL+"/rpc/json-rpc/confluenceservice-v2", auth, 3) json := gopencils.Api(baseURL+"/rpc/json-rpc/confluenceservice-v2", auth, httpClient, 3)
if log.GetLevel() == lorg.LevelTrace { if log.GetLevel() == lorg.LevelTrace {
rest.Logger = &tracer{"rest:"} rest.Logger = &tracer{"rest:"}

2
util/cli.go
View File

@ -49,7 +49,7 @@ func RunMark(ctx context.Context, cmd *cli.Command) error {
return err return err
} }
api := confluence.NewAPI(creds.BaseURL, creds.Username, creds.Password) api := confluence.NewAPI(creds.BaseURL, creds.Username, creds.Password, cmd.Bool("insecure"))
files, err := doublestar.FilepathGlob(cmd.String("files")) files, err := doublestar.FilepathGlob(cmd.String("files"))
if err != nil { if err != nil {

6
util/flags.go
View File

@ -196,6 +196,12 @@ var Flags = []cli.Flag{
Usage: "Enables optional features. Current features: d2, mermaid, mkdocsadmonitions", Usage: "Enables optional features. Current features: d2, mermaid, mkdocsadmonitions",
Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_FEATURES"), altsrctoml.TOML("features", altsrc.NewStringPtrSourcer(&filename))), Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_FEATURES"), altsrctoml.TOML("features", altsrc.NewStringPtrSourcer(&filename))),
}, },
&cli.BoolFlag{
Name: "insecure",
Value: false,
Usage: "skip TLS certificate verification (useful for self-signed certificates)",
Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_INSECURE"), altsrctoml.TOML("insecure", altsrc.NewStringPtrSourcer(&filename))),
},
} }
// CheckMutuallyExclusiveTitleFlags checks if both title-from-h1 and title-from-filename are set // CheckMutuallyExclusiveTitleFlags checks if both title-from-h1 and title-from-filename are set