mirror of
https://github.com/gocsaf/csaf.git
synced 2025-12-22 18:15:42 +01:00
Added unsecure flag to csaf_uploader.
This commit is contained in:
parent
6966e125ac
commit
fc033ad666
1 changed files with 20 additions and 11 deletions
|
|
@ -10,6 +10,7 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"crypto/tls"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
@ -41,6 +42,8 @@ type options struct {
|
||||||
PasswordInteractive bool `short:"i" long:"password-interactive" description:"Enter password interactively" no-ini:"true"`
|
PasswordInteractive bool `short:"i" long:"password-interactive" description:"Enter password interactively" no-ini:"true"`
|
||||||
PassphraseInteractive bool `short:"I" long:"passphrase-interacive" description:"Enter passphrase interactively" no-ini:"true"`
|
PassphraseInteractive bool `short:"I" long:"passphrase-interacive" description:"Enter passphrase interactively" no-ini:"true"`
|
||||||
|
|
||||||
|
Insecure bool `long:"insecure" description:"Do not check TSL certificates from provider"`
|
||||||
|
|
||||||
Config *string `short:"c" long:"config" description:"Path to config ini file" value-name:"INI-FILE" no-ini:"true"`
|
Config *string `short:"c" long:"config" description:"Path to config ini file" value-name:"INI-FILE" no-ini:"true"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -104,6 +107,18 @@ func newProcessor(opts *options) (*processor, error) {
|
||||||
return &p, nil
|
return &p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *processor) httpClient() *http.Client {
|
||||||
|
var transport *http.Transport
|
||||||
|
if p.opts.Insecure {
|
||||||
|
transport = &http.Transport{
|
||||||
|
TLSClientConfig: &tls.Config{
|
||||||
|
InsecureSkipVerify: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &http.Client{Transport: transport}
|
||||||
|
}
|
||||||
|
|
||||||
func writeStrings(header string, messages []string) {
|
func writeStrings(header string, messages []string) {
|
||||||
if len(messages) > 0 {
|
if len(messages) > 0 {
|
||||||
fmt.Println(header)
|
fmt.Println(header)
|
||||||
|
|
@ -120,7 +135,7 @@ func (p *processor) create() error {
|
||||||
}
|
}
|
||||||
req.Header.Set("X-CSAF-PROVIDER-AUTH", p.cachedAuth)
|
req.Header.Set("X-CSAF-PROVIDER-AUTH", p.cachedAuth)
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
resp, err := p.httpClient().Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
@ -237,7 +252,7 @@ func (p *processor) process(filename string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
resp, err := p.httpClient().Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
@ -297,12 +312,6 @@ func readInteractive(prompt string, pw **string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func check(err error) {
|
func check(err error) {
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("error: %v\n", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func checkParser(err error) {
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
|
if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
|
|
@ -317,18 +326,18 @@ func main() {
|
||||||
parser := flags.NewParser(&opts, flags.Default)
|
parser := flags.NewParser(&opts, flags.Default)
|
||||||
|
|
||||||
args, err := parser.Parse()
|
args, err := parser.Parse()
|
||||||
checkParser(err)
|
check(err)
|
||||||
|
|
||||||
if opts.Config != nil {
|
if opts.Config != nil {
|
||||||
iniParser := flags.NewIniParser(parser)
|
iniParser := flags.NewIniParser(parser)
|
||||||
iniParser.ParseAsDefaults = true
|
iniParser.ParseAsDefaults = true
|
||||||
name, err := homedir.Expand(*opts.Config)
|
name, err := homedir.Expand(*opts.Config)
|
||||||
check(err)
|
check(err)
|
||||||
checkParser(iniParser.ParseFile(name))
|
check(iniParser.ParseFile(name))
|
||||||
} else if iniFile := findIniFile(); iniFile != "" {
|
} else if iniFile := findIniFile(); iniFile != "" {
|
||||||
iniParser := flags.NewIniParser(parser)
|
iniParser := flags.NewIniParser(parser)
|
||||||
iniParser.ParseAsDefaults = true
|
iniParser.ParseAsDefaults = true
|
||||||
checkParser(iniParser.ParseFile(iniFile))
|
check(iniParser.ParseFile(iniFile))
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.PasswordInteractive {
|
if opts.PasswordInteractive {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue