22// Use of this source code is governed by a BSD-style
33// license that can be found in the LICENSE file.
44
5- //go:build go1.16
6-
75package legacydash
86
97import (
10- "context"
118 "crypto/hmac"
129 "crypto/md5"
1310 "encoding/json"
@@ -32,7 +29,7 @@ const (
3229// creates a new Result entity, and creates or updates the relevant Commit entity.
3330// If the Log field is not empty, resultHandler creates a new Log entity
3431// and updates the LogHash field before putting the Commit entity.
35- func resultHandler (r * http.Request ) (interface {}, error ) {
32+ func ( h handler ) resultHandler (r * http.Request ) (interface {}, error ) {
3633 if r .Method != "POST" {
3734 return nil , errBadMethod (r .Method )
3835 }
@@ -54,7 +51,7 @@ func resultHandler(r *http.Request) (interface{}, error) {
5451 }
5552 // store the Log text if supplied
5653 if len (res .Log ) > 0 {
57- hash , err := PutLog (ctx , res .Log )
54+ hash , err := h . putLog (ctx , res .Log )
5855 if err != nil {
5956 return nil , fmt .Errorf ("putting Log: %v" , err )
6057 }
@@ -75,23 +72,27 @@ func resultHandler(r *http.Request) (interface{}, error) {
7572 }
7673 return nil
7774 }
78- _ , err := datastoreClient .RunInTransaction (ctx , tx )
75+ _ , err := h . datastoreCl .RunInTransaction (ctx , tx )
7976 return nil , err
8077}
8178
8279// logHandler displays log text for a given hash.
8380// It handles paths like "/log/hash".
84- func logHandler (w http.ResponseWriter , r * http.Request ) {
81+ func (h handler ) logHandler (w http.ResponseWriter , r * http.Request ) {
82+ if h .datastoreCl == nil {
83+ http .Error (w , "no datastore client" , http .StatusNotFound )
84+ return
85+ }
8586 c := r .Context ()
8687 hash := r .URL .Path [strings .LastIndex (r .URL .Path , "/" )+ 1 :]
8788 key := dsKey ("Log" , hash , nil )
8889 l := new (Log )
89- if err := datastoreClient .Get (c , key , l ); err != nil {
90+ if err := h . datastoreCl .Get (c , key , l ); err != nil {
9091 if err == datastore .ErrNoSuchEntity {
9192 // Fall back to default namespace;
9293 // maybe this was on the old dashboard.
9394 key .Namespace = ""
94- err = datastoreClient .Get (c , key , l )
95+ err = h . datastoreCl .Get (c , key , l )
9596 }
9697 if err != nil {
9798 log .Printf ("Error: %v" , err )
@@ -111,7 +112,7 @@ func logHandler(w http.ResponseWriter, r *http.Request) {
111112
112113// clearResultsHandler purge a single build failure from the dashboard.
113114// It currently only supports the main Go repo.
114- func clearResultsHandler (r * http.Request ) (interface {}, error ) {
115+ func ( h handler ) clearResultsHandler (r * http.Request ) (interface {}, error ) {
115116 if r .Method != "POST" {
116117 return nil , errBadMethod (r .Method )
117118 }
@@ -126,7 +127,7 @@ func clearResultsHandler(r *http.Request) (interface{}, error) {
126127
127128 ctx := r .Context ()
128129
129- _ , err := datastoreClient .RunInTransaction (ctx , func (tx * datastore.Transaction ) error {
130+ _ , err := h . datastoreCl .RunInTransaction (ctx , func (tx * datastore.Transaction ) error {
130131 c := & Commit {
131132 PackagePath : "" , // TODO(adg): support clearing sub-repos
132133 Hash : hash ,
@@ -186,12 +187,15 @@ func builderKeyRevoked(builder string) bool {
186187 return false
187188}
188189
189- // AuthHandler wraps an http.HandlerFunc with a handler that validates the
190- // supplied key and builder query parameters.
191- func AuthHandler (h dashHandler ) http.Handler {
192- return http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
193- c := r .Context ()
190+ // authHandler wraps an http.HandlerFunc with a handler that validates the
191+ // supplied key and builder query parameters with the provided key checker.
192+ type authHandler struct {
193+ kc keyCheck
194+ h dashHandler
195+ }
194196
197+ func (a authHandler ) ServeHTTP (w http.ResponseWriter , r * http.Request ) {
198+ { // Block to improve diff readability. Can be unnested later.
195199 // Put the URL Query values into r.Form to avoid parsing the
196200 // request body when calling r.FormValue.
197201 r .Form = r .URL .Query ()
@@ -202,13 +206,13 @@ func AuthHandler(h dashHandler) http.Handler {
202206 // Validate key query parameter for POST requests only.
203207 key := r .FormValue ("key" )
204208 builder := r .FormValue ("builder" )
205- if r .Method == "POST" && ! validKey ( c , key , builder ) {
209+ if r .Method == "POST" && ! a . kc . ValidKey ( key , builder ) {
206210 err = fmt .Errorf ("invalid key %q for builder %q" , key , builder )
207211 }
208212
209213 // Call the original HandlerFunc and return the response.
210214 if err == nil {
211- resp , err = h (r )
215+ resp , err = a . h (r )
212216 }
213217
214218 // Write JSON response.
@@ -221,7 +225,7 @@ func AuthHandler(h dashHandler) http.Handler {
221225 if err = json .NewEncoder (w ).Encode (dashResp ); err != nil {
222226 log .Printf ("encoding response: %v" , err )
223227 }
224- })
228+ }
225229}
226230
227231// validHash reports whether hash looks like a valid git commit hash.
@@ -231,22 +235,27 @@ func validHash(hash string) bool {
231235 return hash != ""
232236}
233237
234- func validKey (c context.Context , key , builder string ) bool {
235- if isMasterKey (c , key ) {
238+ type keyCheck struct {
239+ // The builder master key.
240+ masterKey string
241+ }
242+
243+ func (kc keyCheck ) ValidKey (key , builder string ) bool {
244+ if kc .isMasterKey (key ) {
236245 return true
237246 }
238247 if builderKeyRevoked (builder ) {
239248 return false
240249 }
241- return key == builderKey (c , builder )
250+ return key == kc . builderKey (builder )
242251}
243252
244- func isMasterKey ( ctx context. Context , k string ) bool {
245- return k == masterKey
253+ func ( kc keyCheck ) isMasterKey ( k string ) bool {
254+ return k == kc . masterKey
246255}
247256
248- func builderKey ( ctx context. Context , builder string ) string {
249- h := hmac .New (md5 .New , []byte (masterKey ))
257+ func ( kc keyCheck ) builderKey ( builder string ) string {
258+ h := hmac .New (md5 .New , []byte (kc . masterKey ))
250259 h .Write ([]byte (builder ))
251260 return fmt .Sprintf ("%x" , h .Sum (nil ))
252261}
0 commit comments