wolvie/short
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add flags to switch proto and path

Browse Source
This commit is contained in:
Tom Andrade 2019-03-18 22:40:08 +01:00
parent 38e62f449a
commit c3639c4631
Signed by: wolvie
GPG Key ID: 31AAB07872E82669
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main.go
View File

@ -5,9 +5,11 @@ import (
"fmt" "fmt"
"log" "log"
"math/rand" "math/rand"
"net"
"net/url" "net/url"
"os" "os"
"regexp" "regexp"
"strings"
"time" "time"
"github.com/gomodule/redigo/redis" "github.com/gomodule/redigo/redis"
@ -27,6 +29,8 @@ const (
var domain string var domain string
var redisServer string var redisServer string
var listenAddr string var listenAddr string
var proto string
var path string
var src = rand.NewSource(time.Now().UnixNano()) var src = rand.NewSource(time.Now().UnixNano())
var pool = newPool() var pool = newPool()
@ -84,6 +88,9 @@ func set(c redis.Conn, url, suffix string) error {
} }
func redirect(ctx *web.Context, val string) { func redirect(ctx *web.Context, val string) {
if path != "" {
val = strings.Replace(val, path, "", 1)
}
r, _ := regexp.Compile("[a-zA-Z0-9]+") r, _ := regexp.Compile("[a-zA-Z0-9]+")
key := r.FindString(val) key := r.FindString(val)
conn := pool.Get() conn := pool.Get()
@ -97,13 +104,12 @@ func redirect(ctx *web.Context, val string) {
} }
func shortner(ctx *web.Context) { func shortner(ctx *web.Context) {
// return fmt.Sprintf("%v\n", ctx.Params) _, port, _ := net.SplitHostPort(listenAddr)
u, err := url.ParseRequestURI(ctx.Params["url"]) u, err := url.ParseRequestURI(ctx.Params["url"])
if err != nil { if err != nil {
ctx.Abort(400, "Bad URL") ctx.Abort(400, "Bad URL")
} else { } else {
suffix := RandStringBytesMaskImprSrc(10) suffix := RandStringBytesMaskImprSrc(10)
// nURL := "https://" + domain + "/" + suffix
conn := pool.Get() conn := pool.Get()
defer conn.Close() defer conn.Close()
for { for {
@ -114,11 +120,16 @@ func shortner(ctx *web.Context) {
break break
} }
} }
if port != "80" && proto == "http" {
port = ":" + port + "/"
} else if port != "443" && proto == "https" {
port = ":" + port + "/"
}
err := set(conn, u.String(), suffix) err := set(conn, u.String(), suffix)
if err != nil { if err != nil {
ctx.Abort(500, "Internal Error") ctx.Abort(500, "Internal Error")
} else { } else {
ctx.WriteString("URL shortened at: https://" + domain + "/" + suffix) ctx.WriteString("URL shortened at: " + proto + "://" + domain + port + path + suffix + "\n")
} }
} }
} }
@ -145,13 +156,19 @@ func main() {
flag.StringVar(&domain, "domain", "localhost", "Domain to write to the URLs") flag.StringVar(&domain, "domain", "localhost", "Domain to write to the URLs")
flag.StringVar(&redisServer, "redis", "localhost:6379", "ip/hostname of the redis server to connect") flag.StringVar(&redisServer, "redis", "localhost:6379", "ip/hostname of the redis server to connect")
flag.StringVar(&listenAddr, "addr", "localhost:8080", "Address to listen for connections") flag.StringVar(&listenAddr, "addr", "localhost:8080", "Address to listen for connections")
version := flag.Bool("v", false, "prints current roxy version") flag.StringVar(&path, "path", "", "Path to the base URL (https://localhost/PATH/... remember to append a / at the end")
flag.StringVar(&proto, "proto", "https", "proto to the base URL (HTTPS://localhost/path/... no real https here just to set the url (for like a proxy offloading https")
version := flag.Bool("v", false, "prints current version")
flag.Parse() flag.Parse()
if *version { if *version {
fmt.Printf("%s", appVersion) fmt.Printf("%s", appVersion)
os.Exit(0) os.Exit(0)
} }
if path != "" && !strings.HasSuffix(path, "/") {
path = path + "/"
}
web.Post("/", shortner) web.Post("/", shortner)
web.Get("/(.*)", redirect) web.Get("/(.*)", redirect)
log.Printf("Domain: %s, Redis: %s\n", domain, redisServer) log.Printf("Domain: %s, Redis: %s\n", domain, redisServer)