Get rid of FIXME and lint

thomiceli · May 12, 2024 · dd86d89 · dd86d89
1 parent 6c4d92b
commit dd86d89
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
@@ -14,5 +14,5 @@ func ShouldAllowUnauthenticatedGistAccess(prov AuthInfoProvider, isSingleGistAcc
 	if err != nil {
 		return false, err
 	}
-	return require != true || (isSingleGistAccess && allow == true), nil
+	return !require || (isSingleGistAccess && allow == true), nil
 }
diff --git a/internal/db/admin_setting.go b/internal/db/admin_setting.go
@@ -66,15 +66,15 @@ func initAdminSettings(settings map[string]string) error {
 
 type DBAuthInfo struct{}
 
-func (this DBAuthInfo) RequireLogin() (bool, error) {
+func (auth DBAuthInfo) RequireLogin() (bool, error) {
 	s, err := GetSetting(SettingRequireLogin)
 	if err != nil {
 		return true, err
 	}
 	return s == "1", nil
 }
 
-func (this DBAuthInfo) AllowGistsWithoutLogin() (bool, error) {
+func (auth DBAuthInfo) AllowGistsWithoutLogin() (bool, error) {
 	s, err := GetSetting(SettingAllowGistsWithoutLogin)
 	if err != nil {
 		return false, err

diff --git a/internal/ssh/git_ssh.go b/internal/ssh/git_ssh.go
@@ -39,8 +39,6 @@ func runGitCommand(ch ssh.Channel, gitCmd string, key string, ip string) error {
 		return errors.New("gist not found")
 	}
 
-	// FIXME: this seems to not actually work for clones, the auth process
-	// fails before any metadata is acquired.
 	allowUnauthenticated, err := auth.ShouldAllowUnauthenticatedGistAccess(db.DBAuthInfo{}, true)
 	if err != nil {
 		return errors.New("internal server error")

diff --git a/internal/web/auth.go b/internal/web/auth.go
@@ -447,10 +447,10 @@ type ContextAuthInfo struct {
 	context echo.Context
 }
 
-func (this ContextAuthInfo) RequireLogin() (bool, error) {
-	return getData(this.context, "RequireLogin") == true, nil
+func (auth ContextAuthInfo) RequireLogin() (bool, error) {
+	return getData(auth.context, "RequireLogin") == true, nil
 }
 
-func (this ContextAuthInfo) AllowGistsWithoutLogin() (bool, error) {
-	return getData(this.context, "AllowGistsWithoutLogin") == true, nil
+func (auth ContextAuthInfo) AllowGistsWithoutLogin() (bool, error) {
+	return getData(auth.context, "AllowGistsWithoutLogin") == true, nil
 }