Skip to content

Commit

Permalink
Add checks for commits with missing author and time (#2771)
Browse files Browse the repository at this point in the history
* Add checks for commits with missing author and time

* Fix validate commits with emails if it has no Author
  • Loading branch information
lafriks authored and lunny committed Oct 26, 2017
1 parent bc84110 commit 6a107e5
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 18 deletions.
28 changes: 22 additions & 6 deletions models/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"os/exec"
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/cache"
Expand Down Expand Up @@ -119,11 +120,24 @@ func pushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
if err != nil {
return fmt.Errorf("Commit: %v", err)
}
tagCreatedUnix := commit.Author.When.Unix()

author, err := GetUserByEmail(commit.Author.Email)
if err != nil && !IsErrUserNotExist(err) {
return fmt.Errorf("GetUserByEmail: %v", err)
sig := tag.Tagger
if sig == nil {
sig = commit.Author

This comment has been minimized.

Copy link
@MetaiR

MetaiR Oct 26, 2017

it is never be used because if sig is null, next if will change it to commit.Commiter

This comment has been minimized.

Copy link
@lafriks

lafriks Oct 26, 2017

Author Member

@MetaiR no, only if commit.Author will be nil than sig will stay nil. If author is not nil than sig will not be nil anymore and it will not be overwritten by commiter.

This comment has been minimized.

Copy link
@MetaiR

MetaiR Oct 27, 2017

nice, I didn't think that way

}
if sig == nil {
sig = commit.Committer
}

var author *User
var createdAt = time.Unix(1, 0)

if sig != nil {
author, err = GetUserByEmail(sig.Email)
if err != nil && !IsErrUserNotExist(err) {
return fmt.Errorf("GetUserByEmail: %v", err)
}
createdAt = sig.When
}

commitsCount, err := commit.CommitsCount()
Expand All @@ -144,7 +158,8 @@ func pushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
IsDraft: false,
IsPrerelease: false,
IsTag: true,
CreatedUnix: tagCreatedUnix,
Created: createdAt,
CreatedUnix: createdAt.Unix(),
}
if author != nil {
rel.PublisherID = author.ID
Expand All @@ -155,7 +170,8 @@ func pushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
}
} else {
rel.Sha1 = commit.ID.String()
rel.CreatedUnix = tagCreatedUnix
rel.Created = createdAt
rel.CreatedUnix = createdAt.Unix()
rel.NumCommits = commitsCount
rel.IsDraft = false
if rel.IsTag && author != nil {
Expand Down
15 changes: 11 additions & 4 deletions models/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,9 @@ type UserCommit struct {

// ValidateCommitWithEmail check if author's e-mail of commit is corresponding to a user.
func ValidateCommitWithEmail(c *git.Commit) *User {
if c.Author == nil {
return nil
}
u, err := GetUserByEmail(c.Author.Email)
if err != nil {
return nil
Expand All @@ -1211,11 +1214,15 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
for e != nil {
c := e.Value.(*git.Commit)

if v, ok := emails[c.Author.Email]; !ok {
u, _ = GetUserByEmail(c.Author.Email)
emails[c.Author.Email] = u
if c.Author != nil {
if v, ok := emails[c.Author.Email]; !ok {
u, _ = GetUserByEmail(c.Author.Email)
emails[c.Author.Email] = u
} else {
u = v
}
} else {
u = v
u = nil
}

newCommits.PushBack(UserCommit{
Expand Down
18 changes: 10 additions & 8 deletions templates/repo/view_list.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<th class="four wide">
{{if .LatestCommitUser}}
<img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" />
{{if .LatestCommitUser.FullName}}
<a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
{{else}}
<a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></a>
{{end}}
{{if .LatestCommitUser.FullName}}
<a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
{{else}}
<a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
{{end}}
{{else}}
<img class="ui avatar image img-12" src="{{AvatarLink .LatestCommit.Author.Email}}" />
<strong>{{.LatestCommit.Author.Name}}</strong>
{{if .LatestCommit.Author}}
<img class="ui avatar image img-12" src="{{AvatarLink .LatestCommit.Author.Email}}" />
<strong>{{.LatestCommit.Author.Name}}</strong>
{{end}}
{{end}}
<a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified }} isVerified {{end}}{{end}}" href="{{.RepoLink}}/commit/{{.LatestCommit.ID}}">
{{ShortSha .LatestCommit.ID.String}}
Expand All @@ -30,7 +32,7 @@
</th>
<th class="nine wide">
</th>
<th class="three wide text grey right age">{{TimeSince .LatestCommit.Author.When $.Lang}}</th>
<th class="three wide text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th>
</tr>
</thead>
<tbody>
Expand Down

0 comments on commit 6a107e5

Please sign in to comment.