API Url to HTML Url

Signed-off-by: Hadi <[email protected]>

cmd/main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"log"
+
 	recon_email "github.com/anotherhadi/github-recon/github-recon/email"
 	recon_username "github.com/anotherhadi/github-recon/github-recon/username"
 	github_recon_settings "github.com/anotherhadi/github-recon/settings"
@@ -8,7 +10,10 @@ import (
 )
 
 func main() {
-	settings := github_recon_settings.GetSettings()
+	settings, err := github_recon_settings.GetSettings()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	if !settings.Silent {
 		utils.Header()
@@ -23,7 +28,10 @@ func main() {
 	}
 
 	if settings.TargetType == github_recon_settings.TargetUsername {
-		result := recon_username.Username(settings)
+		result, err := recon_username.Username(settings)
+		if err != nil {
+			log.Fatal(err)
+		}
 		writeJson(settings, result)
 	} else {
 		result := recon_email.Email(settings)

github-recon/email/spoofing.go

@@ -2,6 +2,7 @@ package recon
 
 import (
 	"math/rand"
+	"time"
 
 	github_recon_settings "github.com/anotherhadi/github-recon/settings"
 	"github.com/anotherhadi/github-recon/utils"
@@ -99,6 +100,9 @@ func Spoofing(s github_recon_settings.Settings) (response *SpoofingResult) {
 	}
 	utils.WaitForRateLimit(s, resp)
 
+	const maxRetries = 5
+	const retryDelay = 2 * time.Second
+	for i := 0; i < maxRetries; i++ {
 		commits, _, err := s.Client.Repositories.ListCommits(s.Ctx, repo.Owner.GetLogin(), name, nil)
 		if err != nil {
 			s.Logger.Error("Error while listing commits", "err", err)
@@ -112,8 +116,11 @@ func Spoofing(s github_recon_settings.Settings) (response *SpoofingResult) {
 			response.Email = last.GetAuthor().GetEmail()
 			response.Url = last.GetAuthor().GetHTMLURL()
 			response.AvatarURL = last.GetAuthor().GetAvatarURL()
-	} else {
+			break
-		s.Logger.Error("Only one commit found, something went wrong.", "commits", commits)
+		}
+
+		s.Logger.Info("Only one commit found, retrying...", "attempt", i+1)
+		time.Sleep(retryDelay)
 	}
 
 	if response.Username == "" && response.Name == "" && response.Email == "" {

github-recon/username/deep.go

@@ -82,7 +82,7 @@ func DeepScan(s github_recon_settings.Settings) (response DeepScanResult) {
 		}
 
 		repositories = append(repositories, Repositorie{
-			Repository: repo.GetCloneURL(),
+			Repository: repo.GetHTMLURL(),
 			Owner:      repo.GetOwner().GetLogin(),
 			Name:       repo.GetName(),
 			Size:       repo.GetSize(),
@@ -139,6 +139,11 @@ func DeepScan(s github_recon_settings.Settings) (response DeepScanResult) {
 	}
 	s.Logger.Info("Cloned all repositories", "path", tmp_folder)
 
+	if len(repositories) == 0 {
+		s.Logger.Info("No repositories found for the user, skipping deep scan.")
+		return
+	}
+
 	authorOccurrences := Authors{}
 	mapAuthorToIndex := make(map[string]int)
 	for _, repo := range repositories {

github-recon/username/main.go

@@ -27,16 +27,21 @@ type UsernameResult struct {
 	DeepScan DeepScanResult
 }
 
-func Username(settings github_recon_settings.Settings) UsernameResult {
+func Username(settings github_recon_settings.Settings) (result UsernameResult, err error) {
-
+	result = UsernameResult{
-	result := UsernameResult{
 		Target:     settings.Target,
 		TargetType: settings.TargetType,
 		DateTime:   time.Now().String(),
 	}
 
 	utils.PrintTitle(settings.Silent, "👤 User informations")
-	result.User = User(settings)
+	result.User, err = User(settings)
+	if err != nil {
+		return
+	}
+	if result.User == (UserResult{}) {
+		return
+	}
 	utils.PrintAvatar(settings, result.User.AvatarURL)
 	utils.PrintStruct(settings, result.User, 0)
 
@@ -74,5 +79,5 @@ func Username(settings github_recon_settings.Settings) UsernameResult {
 		utils.PrintStruct(settings, result.DeepScan, 0)
 	}
 
-	return result
+	return
 }

github-recon/username/orgs.go

@@ -23,7 +23,7 @@ func Orgs(s github_recon_settings.Settings) (response OrgsResult) {
 	for _, org := range orgs {
 		o := OrgResult{
 			Name:        org.GetLogin(),
-			URL:         org.GetURL(),
+			URL:         org.GetHTMLURL(),
 			Description: org.GetDescription(),
 		}
 		response = append(response, o)

github-recon/username/user.go

@@ -31,13 +31,13 @@ type UserResult struct {
 	Plan              string
 }
 
-func User(s github_recon_settings.Settings) (response UserResult) {
+func User(s github_recon_settings.Settings) (response UserResult, err error) {
 	user, resp, err := s.Client.Users.Get(s.Ctx, s.Target)
 	if resp.StatusCode == 404 {
-		s.Logger.Fatal("User not found with username")
+		return UserResult{}, nil
 	}
 	if err != nil {
-		s.Logger.Fatal("Failed to fetch user's information", "err", err)
+		return UserResult{}, fmt.Errorf("failed to fetch user's information")
 	}
 
 	u := UserResult{
@@ -65,5 +65,5 @@ func User(s github_recon_settings.Settings) (response UserResult) {
 	}
 
 	utils.WaitForRateLimit(s, resp)
-	return u
+	return u, nil
 }

settings/settings.go

@@ -68,7 +68,7 @@ func GetDefaultSettings() Settings {
 	}
 }
 
-func GetSettings() (settings Settings) {
+func GetSettings() (settings Settings, err error) {
 	settings = GetDefaultSettings()
 	//// Flag settings
 	flag.Usage = func() {
@@ -152,7 +152,7 @@ func GetSettings() (settings Settings) {
 	settings.Target = strings.TrimPrefix(settings.Target, "@") // Remove the @ of the username
 
 	if strings.Contains(settings.Target, " ") {
-		settings.Logger.Fatal("Target cannot contain spaces")
+		err = fmt.Errorf("target cannot contain spaces")
 	}
 
 	if strings.Contains(settings.Target, "@") {