Send HTML in the blobserver unauthorized responses. Easier to demo.

server/go/blobserver/get.go

@@ -42,6 +42,11 @@ func createGetHandler(fetcher blobref.Fetcher) func(http.ResponseWriter, *http.R
 const fetchFailureDelayNs = 200e6 // 200 ms
 const maxJsonSize = 64 * 1024  // should be enough for everyone
 
+func sendUnauthorized(conn http.ResponseWriter) {
+	conn.WriteHeader(http.StatusUnauthorized)
+	fmt.Fprintf(conn, "<h1>Unauthorized</h1>")
+}
+
 func handleGet(conn http.ResponseWriter, req *http.Request, fetcher blobref.Fetcher) {
 	isOwner := auth.IsAuthorized(req)
 
@@ -86,31 +91,31 @@ func handleGet(conn http.ResponseWriter, req *http.Request, fetcher blobref.Fetc
 				file, size, err := fetcher.Fetch(br)
 				if err != nil {
 					log.Printf("Fetch chain 0 of %s failed: %v", br.String(), err)
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 				defer file.Close()
 				if size > maxJsonSize {
 					log.Printf("Fetch chain 0 of %s too large", br.String())
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 				jd := json.NewDecoder(file)
 				m := make(map[string]interface{})
 				if err := jd.Decode(&m); err != nil {
 					log.Printf("Fetch chain 0 of %s wasn't JSON: %v", br.String(), err)
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 				if m["camliType"].(string) != "share" {
 					log.Printf("Fetch chain 0 of %s wasn't a share", br.String())
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 				if len(fetchChain) > 1 && fetchChain[1].String() != m["target"].(string) {
 					log.Printf("Fetch chain 0->1 (%s -> %q) unauthorized, expected hop to %q",
 						br.String(), fetchChain[1].String(), m["target"])
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 			case len(fetchChain) - 1:
@@ -121,7 +126,7 @@ func handleGet(conn http.ResponseWriter, req *http.Request, fetcher blobref.Fetc
 				file, _, err := fetcher.Fetch(br)
 				if err != nil {
 					log.Printf("Fetch chain %d of %s failed: %v", i, br.String(), err)
-					conn.WriteHeader(http.StatusUnauthorized)
+					sendUnauthorized(conn)
 					return
 				}
 				defer file.Close()
@@ -129,14 +134,14 @@ func handleGet(conn http.ResponseWriter, req *http.Request, fetcher blobref.Fetc
 				slurpBytes, err := ioutil.ReadAll(lr)
 				if err != nil {
 					log.Printf("Fetch chain %d of %s failed in slurp: %v", i, br.String(), err)
-					conn.WriteHeader(http.StatusUnauthorized)
+                                        sendUnauthorized(conn)
 					return
 				}
 				saught := fetchChain[i+1].String()
 				if bytes.IndexAny(slurpBytes, saught) == -1 {
 					log.Printf("Fetch chain %d of %s failed; no reference to %s",
 						i, br.String(), saught)
-                                        conn.WriteHeader(http.StatusUnauthorized)
+                                        sendUnauthorized(conn)
                                         return
 				}
 			}