change conf to argsset and flag for oauth

config/config.go

@@ -1,115 +1,77 @@
 package config
 
 import (
-	"local/rproxy3/storage/packable"
-	"log"
-	"strconv"
+	"fmt"
 	"strings"
+	"time"
 )
 
-func GetPort() string {
-	v := packable.NewString()
-	conf.Get(nsConf, flagPort, v)
-	return ":" + strings.TrimPrefix(v.String(), ":")
+type Proxy struct {
+	To      string
+	BOAuthZ bool
 }
 
-func GetRoutes() map[string]string {
-	v := packable.NewString()
-	conf.Get(nsConf, flagRoutes, v)
-	m := make(map[string]string)
-	for _, v := range strings.Split(v.String(), ",") {
-		if len(v) == 0 {
-			return m
-		}
-		from := v[:strings.Index(v, ":")]
-		to := v[strings.Index(v, ":")+1:]
-		m[from] = to
+func parseProxy(s string) (string, Proxy) {
+	p := Proxy{}
+	key := ""
+	l := strings.Split(s, ",")
+	if len(l) > 0 {
+		key = l[0]
 	}
-	return m
+	if len(l) > 1 {
+		p.To = l[1]
+	}
+	if len(l) > 2 {
+		p.BOAuthZ = l[2] == "true"
+	}
+	return key, p
 }
 
-func GetTCP() (string, bool) {
-	v := packable.NewString()
-	conf.Get(nsConf, flagTCP, v)
-	tcpAddr := v.String()
-	return tcpAddr, notEmpty(tcpAddr)
-}
-
-func GetSSL() (string, string, bool) {
-	v := packable.NewString()
-	conf.Get(nsConf, flagCert, v)
-	certPath := v.String()
-	conf.Get(nsConf, flagKey, v)
-	keyPath := v.String()
-	return certPath, keyPath, notEmpty(certPath, keyPath)
+func GetBOAuthZ() (string, bool) {
+	boauthz := conf.Get("oauth").GetString()
+	return boauthz, boauthz != ""
 }
 
 func GetAuth() (string, string, bool) {
-	v := packable.NewString()
-	conf.Get(nsConf, flagUser, v)
-	user := v.String()
-	conf.Get(nsConf, flagPass, v)
-	pass := v.String()
-	return user, pass, notEmpty(user, pass)
+	user := conf.Get("user").GetString()
+	pass := conf.Get("pass").GetString()
+	return user, pass, user != "" && pass != ""
 }
 
-func notEmpty(s ...string) bool {
-	for i := range s {
-		if s[i] == "" || s[i] == "/dev/null" {
-			return false
-		}
-	}
-	return true
+func GetPort() string {
+	port := conf.Get("p").GetInt()
+	return ":" + fmt.Sprint(port)
 }
 
 func GetRate() (int, int) {
-	r := packable.NewString()
-	conf.Get(nsConf, flagRate, r)
-	b := packable.NewString()
-	conf.Get(nsConf, flagBurst, b)
-
-	rate, err := strconv.Atoi(r.String())
-	if err != nil {
-		log.Printf("illegal rate: %v", err)
-		rate = 5
-	}
-	burst, _ := strconv.Atoi(b.String())
-	if err != nil {
-		log.Printf("illegal burst: %v", err)
-		burst = 5
-	}
-
+	rate := conf.Get("r").GetInt()
+	burst := conf.Get("b").GetInt()
 	return rate, burst
 }
 
-func GetTimeout() int {
-	t := packable.NewString()
-	conf.Get(nsConf, flagTimeout, t)
-
-	timeout, err := strconv.Atoi(t.String())
-	if err != nil || timeout == 5 {
-		return 5
+func GetRoutes() map[string]Proxy {
+	list := conf.Get("proxy").GetString()
+	definitions := strings.Split(list, ",,")
+	routes := make(map[string]Proxy)
+	for _, definition := range definitions {
+		k, v := parseProxy(definition)
+		routes[k] = v
 	}
+	return routes
+}
 
+func GetSSL() (string, string, bool) {
+	crt := conf.Get("crt").GetString()
+	key := conf.Get("key").GetString()
+	return crt, key, crt != "" && key != ""
+}
+
+func GetTCP() (string, bool) {
+	tcp := conf.Get("tcp").GetString()
+	return tcp, tcp != ""
+}
+
+func GetTimeout() time.Duration {
+	timeout := conf.Get("timeout").GetDuration()
 	return timeout
 }
-
-func GetRewrites(hostMatch string) map[string]string {
-	v := packable.NewString()
-	conf.Get(nsConf, flagRewrites, v)
-	m := make(map[string]string)
-	for _, v := range strings.Split(v.String(), ",") {
-		vs := strings.Split(v, ":")
-		if len(v) < 3 {
-			continue
-		}
-		host := vs[0]
-		if host != hostMatch {
-			continue
-		}
-		from := vs[1]
-		to := strings.Join(vs[2:], ":")
-		m[from] = to
-	}
-	return m
-}