gogs#3076 detect invalid tag name git error

vroomanj · Jul 23, 2016 · c912494 · c912494
1 parent 69dae1e
commit c912494
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.48 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.49 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
@@ -725,6 +725,7 @@ release.deletion = Release Deletion
 release.deletion_desc = Deleting this release will delete the corresponding Git tag. Do you want to continue?
 release.deletion_success = Release has been deleted successfully!
 release.tag_name_already_exist = Release with this tag name already exists.
+release.tag_name_invalid = Tag name is not valid.
 release.downloads = Downloads
 
 [org]

diff --git a/gogs.go b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.48.0722"
+const APP_VER = "0.9.49.0723"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/error.go b/models/error.go
@@ -387,7 +387,7 @@ func IsErrReleaseAlreadyExist(err error) bool {
 }
 
 func (err ErrReleaseAlreadyExist) Error() string {
-	return fmt.Sprintf("Release tag already exist [tag_name: %s]", err.TagName)
+	return fmt.Sprintf("release tag already exist [tag_name: %s]", err.TagName)
 }
 
 type ErrReleaseNotExist struct {
@@ -401,7 +401,20 @@ func IsErrReleaseNotExist(err error) bool {
 }
 
 func (err ErrReleaseNotExist) Error() string {
-	return fmt.Sprintf("Release tag does not exist [id: %d, tag_name: %s]", err.ID, err.TagName)
+	return fmt.Sprintf("release tag does not exist [id: %d, tag_name: %s]", err.ID, err.TagName)
+}
+
+type ErrInvalidTagName struct {
+	TagName string
+}
+
+func IsErrInvalidTagName(err error) bool {
+	_, ok := err.(ErrInvalidTagName)
+	return ok
+}
+
+func (err ErrInvalidTagName) Error() string {
+	return fmt.Sprintf("release tag name is not valid [tag_name: %s]", err.TagName)
 }
 
 // __________                             .__
@@ -421,7 +434,7 @@ func IsErrBranchNotExist(err error) bool {
 }
 
 func (err ErrBranchNotExist) Error() string {
-	return fmt.Sprintf("Branch does not exist [name: %s]", err.Name)
+	return fmt.Sprintf("branch does not exist [name: %s]", err.Name)
 }
 
 //  __      __      ___.   .__                   __

diff --git a/models/release.go b/models/release.go
@@ -67,9 +67,12 @@ func createTag(gitRepo *git.Repository, rel *Release) error {
 				return fmt.Errorf("GetBranchCommit: %v", err)
 			}
 
-			// Trim '--' prefix to prevent command line argument vulnerability
+			// Trim '--' prefix to prevent command line argument vulnerability.
 			rel.TagName = strings.TrimPrefix(rel.TagName, "--")
 			if err = gitRepo.CreateTag(rel.TagName, commit.ID.String()); err != nil {
+				if strings.Contains(err.Error(), "is not a valid tag name") {
+					return ErrInvalidTagName{rel.TagName}
+				}
 				return err
 			}
 		} else {

diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go
diff --git a/public/css/gogs.css b/public/css/gogs.css
@@ -1968,6 +1968,9 @@ footer .ui.language .menu {
 .repository.new.release .target {
   min-width: 500px;
 }
+.repository.new.release .target #tag-name {
+  margin-top: -4px;
+}
 .repository.new.release .target .at {
   margin-left: -5px;
   margin-right: 5px;

diff --git a/public/less/_repository.less b/public/less/_repository.less
@@ -954,6 +954,10 @@
 		.target {
 			min-width: 500px;
 
+			#tag-name {
+				margin-top: -4px;
+			}
+
 			.at {
 				margin-left: -5px;
 				margin-right: 5px;

diff --git a/routers/repo/release.go b/routers/repo/release.go
@@ -188,10 +188,13 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) {
 	}
 
 	if err = models.CreateRelease(ctx.Repo.GitRepo, rel); err != nil {
-		if models.IsErrReleaseAlreadyExist(err) {
-			ctx.Data["Err_TagName"] = true
+		ctx.Data["Err_TagName"] = true
+		switch {
+		case models.IsErrReleaseAlreadyExist(err):
 			ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_already_exist"), RELEASE_NEW, &form)
-		} else {
+		case models.IsErrInvalidTagName(err):
+			ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_invalid"), RELEASE_NEW, &form)
+		default:
 			ctx.Handle(500, "CreateRelease", err)
 		}
 		return

diff --git a/templates/.VERSION b/templates/.VERSION
@@ -1 +1 @@
-0.9.48.0722
+0.9.49.0723
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
@@ -19,7 +19,7 @@
 					{{if .PageIsEditRelease}}
 						<b>{{.tag_name}}</b><span class="at">@</span><strong>{{.tag_target}}</strong>
 					{{else}}
-						<input name="tag_name" value="{{.tag_name}}" placeholder="{{.i18n.Tr "repo.release.tag_name"}}" autofocus required>
+						<input id="tag-name" name="tag_name" value="{{.tag_name}}" placeholder="{{.i18n.Tr "repo.release.tag_name"}}" autofocus required>
 						<span class="at">@</span>
 						<div class="ui selection dropdown">
 							<input type="hidden" name="tag_target" value="{{.tag_target}}"/>