james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-05-24 00:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set auth without authfile

Browse Source 
With this patch, it is possible to pass username and password directly
on the command line with:

```shell
yarr --auth 'username:password'
```

The corresponding environment variable comes handy with containers:
```shell
YARR_AUTH='username:password' yarr
```
This commit is contained in:
Pierre Prinetti 2022-07-04 17:55:21 +02:00 committed by nkanaev
parent f030a4075b
commit 10e6bfa5a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.go
View File

@ -47,7 +47,7 @@ func parseAuthfile(authfile io.Reader) (username, password string, err error) {
func main() { func main() {
platform.FixConsoleIfNeeded() platform.FixConsoleIfNeeded()
var addr, db, authfile, certfile, keyfile, basepath, logfile string var addr, db, authfile, auth, certfile, keyfile, basepath, logfile string
var ver, open bool var ver, open bool
flag.CommandLine.SetOutput(os.Stdout) flag.CommandLine.SetOutput(os.Stdout)
@ -62,7 +62,8 @@ func main() {
flag.StringVar(&addr, "addr", opt("YARR_ADDR", "127.0.0.1:7070"), "address to run server on") flag.StringVar(&addr, "addr", opt("YARR_ADDR", "127.0.0.1:7070"), "address to run server on")
flag.StringVar(&basepath, "base", opt("YARR_BASE", ""), "base path of the service url") flag.StringVar(&basepath, "base", opt("YARR_BASE", ""), "base path of the service url")
flag.StringVar(&authfile, "auth-file", opt("YARR_AUTHFILE", ""), "`path` to a file containing username:password") flag.StringVar(&authfile, "auth-file", opt("YARR_AUTHFILE", ""), "`path` to a file containing username:password. Takes precedence over --auth (or YARR_AUTH)")
flag.StringVar(&auth, "auth", opt("YARR_AUTH", ""), "string with username and password in the format `username:password`")
flag.StringVar(&certfile, "cert-file", opt("YARR_CERTFILE", ""), "`path` to cert file for https") flag.StringVar(&certfile, "cert-file", opt("YARR_CERTFILE", ""), "`path` to cert file for https")
flag.StringVar(&keyfile, "key-file", opt("YARR_KEYFILE", ""), "`path` to key file for https") flag.StringVar(&keyfile, "key-file", opt("YARR_KEYFILE", ""), "`path` to key file for https")
flag.StringVar(&db, "db", opt("YARR_DB", ""), "storage file `path`") flag.StringVar(&db, "db", opt("YARR_DB", ""), "storage file `path`")
@ -114,6 +115,11 @@ func main() {
if err != nil { if err != nil {
log.Fatal("Failed to parse auth file: ", err) log.Fatal("Failed to parse auth file: ", err)
} }
} else if auth != "" {
username, password, err = parseAuthfile(strings.NewReader(auth))
if err != nil {
log.Fatal("Failed to parse auth literal: ", err)
}
} }
if (certfile != "" || keyfile != "") && (certfile == "" || keyfile == "") { if (certfile != "" || keyfile != "") && (certfile == "" || keyfile == "") {