diff --git a/wrp.go b/wrp.go index 99cb56f..16f6765 100644 --- a/wrp.go +++ b/wrp.go @@ -63,84 +63,86 @@ type wrpReq struct { K string // keys to send F string // Fn buttons T string // imgtype + o http.ResponseWriter + r *http.Request } -func (w *wrpReq) parseForm(req *http.Request) { - req.ParseForm() - w.U = req.FormValue("url") +func (w *wrpReq) parseForm() { + w.r.ParseForm() + w.U = w.r.FormValue("url") if len(w.U) > 1 && !strings.HasPrefix(w.U, "http") { w.U = fmt.Sprintf("http://www.google.com/search?q=%s", url.QueryEscape(w.U)) } - w.W, _ = strconv.ParseInt(req.FormValue("w"), 10, 64) - w.H, _ = strconv.ParseInt(req.FormValue("h"), 10, 64) + w.W, _ = strconv.ParseInt(w.r.FormValue("w"), 10, 64) + w.H, _ = strconv.ParseInt(w.r.FormValue("h"), 10, 64) if w.W < 10 && w.H < 10 { w.W = defgeom.w w.H = defgeom.h } - w.S, _ = strconv.ParseFloat(req.FormValue("s"), 64) + w.S, _ = strconv.ParseFloat(w.r.FormValue("s"), 64) if w.S < 0.1 { w.S = 1.0 } - w.C, _ = strconv.ParseInt(req.FormValue("c"), 10, 64) + w.C, _ = strconv.ParseInt(w.r.FormValue("c"), 10, 64) if w.C < 2 || w.C > 256 { w.C = defgeom.c } - w.K = req.FormValue("k") - w.F = req.FormValue("Fn") - w.T = req.FormValue("t") + w.K = w.r.FormValue("k") + w.F = w.r.FormValue("Fn") + w.T = w.r.FormValue("t") if w.T != "gif" && w.T != "png" { w.T = deftype } - log.Printf("%s WrpReq from Form: %+v\n", req.RemoteAddr, w) + log.Printf("%s WrpReq from Form: %+v\n", w.r.RemoteAddr, w) } -func (w wrpReq) printPage(out http.ResponseWriter, bgcolor string) { +func (w wrpReq) printPage(bgcolor string) { var s string - out.Header().Set("Cache-Control", "max-age=0") - out.Header().Set("Expires", "-1") - out.Header().Set("Pragma", "no-cache") - out.Header().Set("Content-Type", "text/html") - fmt.Fprintf(out, "\n", version) - fmt.Fprintf(out, "\nWRP %s\n\n", w.U, bgcolor) - fmt.Fprintf(out, "
\n") - fmt.Fprintf(out, "", w.U) - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "W \n", w.W) - fmt.Fprintf(out, "H \n", w.H) - fmt.Fprintf(out, "S ", w.U) + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "W \n", w.W) + fmt.Fprintf(w.o, "H \n", w.H) + fmt.Fprintf(w.o, "S \n") - fmt.Fprintf(out, "T \n") + fmt.Fprintf(w.o, "T \n") - fmt.Fprintf(out, "C \n", w.C) - fmt.Fprintf(out, "K \n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "\n") - fmt.Fprintf(out, "

\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "C \n", w.C) + fmt.Fprintf(w.o, "K \n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "\n") + fmt.Fprintf(w.o, "
\n") } -func (w wrpReq) printFooter(out http.ResponseWriter, h string, s string) { - fmt.Fprintf(out, "\n

"+ +func (w wrpReq) printFooter(h string, s string) { + fmt.Fprintf(w.o, "\n

"+ "Web Rendering Proxy Version %s | Shutdown WRP | "+ "Page Height: %s | Img Size: %s\n\n", w.W, w.H, w.S, w.C, w.T, version, h, s) } @@ -148,18 +150,22 @@ func (w wrpReq) printFooter(out http.ResponseWriter, h string, s string) { func pageServer(out http.ResponseWriter, req *http.Request) { log.Printf("%s Page Request for %s [%+v]\n", req.RemoteAddr, req.URL.Path, req.URL.RawQuery) var w wrpReq - w.parseForm(req) + w.r = req + w.o = out + w.parseForm() if len(w.U) > 4 { - w.capture(req.RemoteAddr, out) + w.capture() } else { - w.printPage(out, "#FFFFFF") - w.printFooter(out, "", "") + w.printPage("#FFFFFF") + w.printFooter("", "") } } func mapServer(out http.ResponseWriter, req *http.Request) { log.Printf("%s ISMAP Request for %s [%+v]\n", req.RemoteAddr, req.URL.Path, req.URL.RawQuery) w, ok := ismap[req.URL.Path] + w.r = req + w.o = out if !ok { fmt.Fprintf(out, "Unable to find map %s\n", req.URL.Path) log.Printf("Unable to find map %s\n", req.URL.Path) @@ -176,10 +182,10 @@ func mapServer(out http.ResponseWriter, req *http.Request) { } log.Printf("%s WrpReq from ISMAP: %+v\n", req.RemoteAddr, w) if len(w.U) > 4 { - w.capture(req.RemoteAddr, out) + w.capture() } else { - w.printPage(out, "#FFFFFF") - w.printFooter(out, "", "") + w.printPage("#FFFFFF") + w.printFooter("", "") } } @@ -207,13 +213,13 @@ func imgServer(out http.ResponseWriter, req *http.Request) { out.(http.Flusher).Flush() } -func (w wrpReq) capture(c string, out http.ResponseWriter) { +func (w wrpReq) capture() { var err error if w.X > 0 && w.Y > 0 { - log.Printf("%s Mouse Click %d,%d\n", c, w.X, w.Y) + log.Printf("%s Mouse Click %d,%d\n", w.r.RemoteAddr, w.X, w.Y) err = chromedp.Run(ctx, chromedp.MouseClickXY(float64(w.X)/float64(w.S), float64(w.Y)/float64(w.S))) } else if len(w.F) > 0 { - log.Printf("%s Button %v\n", c, w.F) + log.Printf("%s Button %v\n", w.r.RemoteAddr, w.F) switch w.F { case "Bk": err = chromedp.Run(ctx, chromedp.NavigateBack()) @@ -231,20 +237,20 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { err = chromedp.Run(ctx, chromedp.KeyEvent("\u0303")) } } else if len(w.K) > 0 { - log.Printf("%s Sending Keys: %#v\n", c, w.K) + log.Printf("%s Sending Keys: %#v\n", w.r.RemoteAddr, w.K) err = chromedp.Run(ctx, chromedp.KeyEvent(w.K)) } else { - log.Printf("%s Processing Capture Request for %s\n", c, w.U) + log.Printf("%s Processing Capture Request for %s\n", w.r.RemoteAddr, w.U) err = chromedp.Run(ctx, chromedp.Navigate(w.U)) } if err != nil { if err.Error() == "context canceled" { - log.Printf("%s Contex cancelled, try again", c) - fmt.Fprintf(out, "
%s
-- restarting, try again", err) + log.Printf("%s Contex cancelled, try again", w.r.RemoteAddr) + fmt.Fprintf(w.o, "
%s
-- restarting, try again", err) ctx, cancel = chromedp.NewContext(context.Background()) } else { - log.Printf("%s %s", c, err) - fmt.Fprintf(out, "
%s
", err) + log.Printf("%s %s", w.r.RemoteAddr, err) + fmt.Fprintf(w.o, "
%s
", err) } return } @@ -270,8 +276,8 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { fmt.Sscanf(style.Value, "rgb(%d,%d,%d)", &r, &g, &b) } } - log.Printf("%s Landed on: %s, Height: %v\n", c, w.U, h) - w.printPage(out, fmt.Sprintf("#%02X%02X%02X", r, g, b)) + log.Printf("%s Landed on: %s, Height: %v\n", w.r.RemoteAddr, w.U, h) + w.printPage(fmt.Sprintf("#%02X%02X%02X", r, g, b)) if w.H == 0 && h > 0 { chromedp.Run(ctx, emulation.SetDeviceMetricsOverride(int64(float64(w.W)/w.S), h+30, w.S, false)) } else { @@ -279,8 +285,8 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { } err = chromedp.Run(ctx, chromedp.CaptureScreenshot(&pngcap)) if err != nil { - log.Printf("%s Failed to capture screenshot: %s\n", c, err) - fmt.Fprintf(out, "
Unable to capture screenshot:
%s
\n", err) + log.Printf("%s Failed to capture screenshot: %s\n", w.r.RemoteAddr, err) + fmt.Fprintf(w.o, "
Unable to capture screenshot:
%s
\n", err) return } seq := rand.Intn(9999) @@ -292,22 +298,22 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { if w.T == "gif" { i, err := png.Decode(bytes.NewReader(pngcap)) if err != nil { - log.Printf("%s Failed to decode screenshot: %s\n", c, err) - fmt.Fprintf(out, "
Unable to decode page screenshot:
%s
\n", err) + log.Printf("%s Failed to decode screenshot: %s\n", w.r.RemoteAddr, err) + fmt.Fprintf(w.o, "
Unable to decode page screenshot:
%s
\n", err) return } var gifbuf bytes.Buffer err = gif.Encode(&gifbuf, i, &gif.Options{NumColors: int(w.C), Quantizer: quantize.MedianCutQuantizer{}}) if err != nil { - log.Printf("%s Failed to encode GIF: %s\n", c, err) - fmt.Fprintf(out, "
Unable to encode GIF:
%s
\n", err) + log.Printf("%s Failed to encode GIF: %s\n", w.r.RemoteAddr, err) + fmt.Fprintf(w.o, "
Unable to encode GIF:
%s
\n", err) return } img[imgpath] = gifbuf ssize = fmt.Sprintf("%.1f MB", float32(len(gifbuf.Bytes()))/1024.0/1024.0) sw = i.Bounds().Max.X sh = i.Bounds().Max.Y - log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d, %dx%d\n", c, imgpath, ssize, w.C, sw, sh) + log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d, %dx%d\n", w.r.RemoteAddr, imgpath, ssize, w.C, sw, sh) } else if w.T == "png" { pngbuf := bytes.NewBuffer(pngcap) img[imgpath] = *pngbuf @@ -315,11 +321,11 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { ssize = fmt.Sprintf("%.1f MB", float32(len(pngbuf.Bytes()))/1024.0/1024.0) sw = cfg.Width sh = cfg.Height - log.Printf("%s Got PNG image: %s, Size: %s, %dx%d\n", c, imgpath, ssize, sw, sh) + log.Printf("%s Got PNG image: %s, Size: %s, %dx%d\n", w.r.RemoteAddr, imgpath, ssize, sw, sh) } - fmt.Fprintf(out, "\"Url:", mappath, imgpath, w.U, ssize, sw, sh) - w.printFooter(out, fmt.Sprintf("%d PX", h), ssize) - log.Printf("%s Done with caputure for %s\n", c, w.U) + fmt.Fprintf(w.o, "\"Url:", mappath, imgpath, w.U, ssize, sw, sh) + w.printFooter(fmt.Sprintf("%d PX", h), ssize) + log.Printf("%s Done with caputure for %s\n", w.r.RemoteAddr, w.U) } func haltServer(out http.ResponseWriter, req *http.Request) {