darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed an Unhandled Error in badges.go

Browse source 
There was an unhandled error in badges.go. If you pass an invalid
branch to the badge handler (http://beta.drone.io/github.com/drone/drone/
status.svg?branch=this) the browser is told to redirect to a blank string.
This is unintended behavior. Now, a 404 response is sent instead.
This commit is contained in:
Martin Charles 2014-06-02 12:44:27 -04:00
parent 0d25dc1595
commit c6930ef57b
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkg/handler/badges.go
View file

@ -43,26 +43,29 @@ func Badge(w http.ResponseWriter, r *http.Request) error {
// get the latest commit from the database
// for the requested branch
commit, err := database.GetBranch(repo.ID, branchParam)
if err == nil {
switch {
case commit.Status == "Success" && len(successParam) == 0:
// if no success image is provided, we serve a
// badge using the shields.io service
badge = badgeSuccess
case commit.Status == "Success" && len(successParam) != 0:
// otherwise we serve the user defined success badge
badge = successParam
case commit.Status == "Failure" && len(failureParam) == 0:
// if no failure image is provided, we serve a
// badge using the shields.io service
badge = badgeFailure
case commit.Status == "Failure" && len(failureParam) != 0:
// otherwise we serve the user defined failure badge
badge = failureParam
default:
// otherwise load unknown image
badge = badgeUnknown
}
if err != nil {
http.NotFound(w, r)
return nil
}
switch {
case commit.Status == "Success" && len(successParam) == 0:
// if no success image is provided, we serve a
// badge using the shields.io service
badge = badgeSuccess
case commit.Status == "Success" && len(successParam) != 0:
// otherwise we serve the user defined success badge
badge = successParam
case commit.Status == "Failure" && len(failureParam) == 0:
// if no failure image is provided, we serve a
// badge using the shields.io service
badge = badgeFailure
case commit.Status == "Failure" && len(failureParam) != 0:
// otherwise we serve the user defined failure badge
badge = failureParam
default:
// otherwise load unknown image
badge = badgeUnknown
}
http.Redirect(w, r, badge, http.StatusSeeOther)