Merge pull request apache#38 from wangtuanjie/wtj2

lsproxy support fwd proxy

Author: wangtuanjie

go/src/pili.qiniu.com/app/pili-lsproxy/README.md

@@ -1,8 +1,24 @@
-LOCAL STATD PROXY
+LOCAL SECURITY PROXY
 -----------------
 
-本地的正向STATD代理服务器，主要功能增加了鉴权，方便本地浏览statd的数据
+本地的正向HTTP代理服务器，方便本地调用鉴权的接口
 
-使用方法
-* `./pili-lsproxy -access "<admin access key>" -secret "<admin secret key>"`
-* 然后本地浏览器打开`http://127.0.0.1:8090/statd/chart/upflow?$uid=1380603831&start=20160601&g=day&select=flow`
+## 运行方法
+`./pili-lsproxy -access "<access key>" -secret "<secret key>" [-host "<default host>"`]
+
+
+## 使用方法
+
+#### 直接请求
+`curl -vv 'http://127.0.0.1:8090/v2/hubs/inlive/monitor/publish?$uid=1380301031'`
+
+此时目标为运行参数指定的host
+
+#### 正向代理
+`curl -vv 'http://pili.qiniuapi.com/v2/hubs/inlive/monitor/publish?$uid=1380301031' -x 127.0.0.1:8090`
+
+
+## 权限
+* 当前只支持`qiniu/mac`形式的鉴权
+* sudo，尝试从`url.Query`提取`$uid`参数，需要admin权限
+* 没指定`$uid`参数时，使用参数指定的密钥直接签名

go/src/pili.qiniu.com/app/pili-lsproxy/main.go

@@ -14,10 +14,11 @@ import (
 func main() {
 
 	var (
-		host      = flag.String("host", "pili.qiniuapi.com", "dest host")
-		accessKey = flag.String("access", "", "access key")
-		secretKey = flag.String("secret", "", "secret key")
-		addr      = flag.String("addr", ":8090", "run addr")
+		defaultHost = flag.String("host", "pili.qiniuapi.com", "default host")
+		accessKey   = flag.String("access", "", "access key")
+		secretKey   = flag.String("secret", "", "secret key")
+		addr        = flag.String("addr", ":8090", "run addr")
+		https       = flag.Bool("https", true, "use https scheme")
 	)
 	flag.Parse()
 
@@ -26,9 +27,18 @@ func main() {
 		SecretKey: []byte(*secretKey),
 	}
 
+	scheme := "http"
+	if *https {
+		scheme = "https"
+	}
+
 	http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
 
 		var tr http.RoundTripper
+		host := req.URL.Host
+		if host == "" {
+			host = *defaultHost
+		}
 
 		query := req.URL.Query()
 		uid := query.Get("$uid")
@@ -41,10 +51,10 @@ func main() {
 		}
 
 		u := &url.URL{
-			Scheme: "http",
-			Host:   *host,
+			Scheme: scheme,
+			Host:   host,
 		}
-		req.Host = *host
+		req.Host = host
 
 		proxy := httputil.NewSingleHostReverseProxy(u)
 		proxy.Transport = tr