rename POSTKey to URLKey

aerth · Jun 16, 2016 · 8596769 · 8596769
1 parent 98fba0c
commit 8596769
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/routes.go b/routes.go
@@ -39,13 +39,16 @@ func route(cwd string, staticDir string) (r *mux.Router) {
  r.Methods("GET").Path("/static/{dir}/{whatever}.mp3").Handler(s)
  r.Methods("GET").Path("/static/{dir}/{whatever}.m3u").Handler(s)
  r.Methods("GET").Path("/static/{dir}/{whatever}.md").Handler(s)
- r.Methods("GET").Path("/files/{whatever}.tgz").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.txz").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.txt").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.tar").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.zip").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.tar.gz").Handler(sf)
- r.Methods("GET").Path("/files/{whatever}.tar.bz2").Handler(sf)
+ r.Methods("GET").Path("/files/").Handler(sf)
+ /*
+ r.Methods("GET").Path("/files/{whatever}.tgz").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.txz").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.txt").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.tar").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.zip").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.tar.gz").Handler(ss)
+ r.Methods("GET").Path("/files/{whatever}.tar.bz2").Handler(ss)
+ */
  if *customExtension != "" {
  r.Methods("GET").Path("/files/{whatever}." + *customExtension).Handler(sf)
  }

diff --git a/server.go b/server.go
@@ -19,8 +19,9 @@ import (
 
 func homeHandler(w http.ResponseWriter, r *http.Request) {
  hitcounter = hitcounter + 1
+ cosgo.Visitors = hitcounter
  if !*quiet {
- log.Printf("Visitor: %s %s %s %s", r.UserAgent(), r.RemoteAddr, r.Host, r.RequestURI)
+ log.Printf("Visitor #%v: %s %s %s %s", cosgo.Visitors, r.UserAgent(), r.RemoteAddr, r.Host, r.RequestURI)
  }
 
  query, err := url.ParseQuery(r.URL.RawQuery)
@@ -135,9 +136,9 @@ func verifyKey(r *http.Request) bool {
  userkey = strings.TrimRight(userkey, "/send")
  // Check URL Key
  if *debug {
- log.Printf("\nComparing... \n\t" + userkey + "\n\t" + cosgo.PostKey)
+ log.Printf("\nComparing... \n\t" + userkey + "\n\t" + cosgo.URLKey)
  }
- if userkey != cosgo.PostKey {
+ if userkey != cosgo.URLKey {
  log.Println("Key Mismatch. ", r.UserAgent(), r.RemoteAddr, r.RequestURI+"\n")
  return false
  }
@@ -219,6 +220,7 @@ func srvSuccess(r *http.Request, rw http.ResponseWriter, status int) {
 // serverSingle just shows one file.
 func serveSingle(pattern string, filename string) {
  http.HandleFunc(pattern, func(w http.ResponseWriter, r *http.Request) {
+ log.Printf("Serving %s: %s at %s", pattern, r.UserAgent(), r.RemoteAddr)
  http.ServeContent(w, r, filename, time.Now(), nil)
  })
 }