mirror of
https://github.com/tinyauthapp/tinyauth.git
synced 2026-08-31 02:23:31 +08:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c2cb08a7a |
@@ -23,7 +23,7 @@ jobs:
|
|||||||
REPO: ${{ github.event.repository.name }}
|
REPO: ${{ github.event.repository.name }}
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
|
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
|
||||||
with:
|
with:
|
||||||
prerelease: true
|
prerelease: true
|
||||||
tag_name: nightly
|
tag_name: nightly
|
||||||
@@ -476,7 +476,7 @@ jobs:
|
|||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
|
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
|
||||||
with:
|
with:
|
||||||
files: binaries/*
|
files: binaries/*
|
||||||
tag_name: nightly
|
tag_name: nightly
|
||||||
|
|||||||
@@ -449,6 +449,6 @@ jobs:
|
|||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
|
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
|
||||||
with:
|
with:
|
||||||
files: binaries/*
|
files: binaries/*
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -344,31 +343,27 @@ func (controller *OIDCController) authorizeComplete(c *gin.Context) {
|
|||||||
// Create the authorization code
|
// Create the authorization code
|
||||||
code := controller.oidc.CreateCode(*authorizeReq, *userContext)
|
code := controller.oidc.CreateCode(*authorizeReq, *userContext)
|
||||||
|
|
||||||
cu, err := url.Parse(authorizeReq.RedirectURI)
|
queries, err := query.Values(AuthorizeCallback{
|
||||||
|
Code: code,
|
||||||
|
State: authorizeReq.State,
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
controller.authorizeError(c, authorizeErrorParams{
|
controller.authorizeError(c, authorizeErrorParams{
|
||||||
err: err,
|
err: err,
|
||||||
reason: "Failed to parse redirect URI",
|
reason: "Failed to build query",
|
||||||
reasonPublic: "Failed to parse redirect URI",
|
reasonPublic: "Failed to build query",
|
||||||
json: true,
|
callback: authorizeReq.RedirectURI,
|
||||||
|
callbackError: "server_error",
|
||||||
|
state: authorizeReq.State,
|
||||||
|
json: true,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
q := cu.Query()
|
|
||||||
|
|
||||||
q.Set("code", code)
|
|
||||||
|
|
||||||
if authorizeReq.State != "" {
|
|
||||||
q.Set("state", authorizeReq.State)
|
|
||||||
}
|
|
||||||
|
|
||||||
cu.RawQuery = q.Encode()
|
|
||||||
|
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
"status": 200,
|
"status": 200,
|
||||||
"redirect_uri": cu.String(),
|
"redirect_uri": fmt.Sprintf("%s?%s", authorizeReq.RedirectURI, queries.Encode()),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -644,37 +639,37 @@ func (controller *OIDCController) authorizeError(c *gin.Context, params authoriz
|
|||||||
controller.log.App.Error().Err(params.err).Str("reason", params.reason).Msg("Authorization error")
|
controller.log.App.Error().Err(params.err).Str("reason", params.reason).Msg("Authorization error")
|
||||||
|
|
||||||
if params.callback != "" {
|
if params.callback != "" {
|
||||||
cu, err := url.Parse(params.callback)
|
errorQueries := CallbackError{
|
||||||
|
Error: params.callbackError,
|
||||||
|
}
|
||||||
|
|
||||||
|
if params.reasonPublic != "" {
|
||||||
|
errorQueries.ErrorDescription = params.reasonPublic
|
||||||
|
}
|
||||||
|
|
||||||
|
if params.state != "" {
|
||||||
|
errorQueries.State = params.state
|
||||||
|
}
|
||||||
|
|
||||||
|
queries, err := query.Values(errorQueries)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
controller.log.App.Error().Err(err).Msg("Failed to parse callback URL")
|
controller.log.App.Error().Err(err).Msg("Failed to build callback error query")
|
||||||
c.AbortWithStatus(http.StatusInternalServerError)
|
c.AbortWithStatus(http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
q := cu.Query()
|
redirectUrl := fmt.Sprintf("%s?%s", params.callback, queries.Encode())
|
||||||
|
|
||||||
q.Set("error", params.callbackError)
|
|
||||||
|
|
||||||
if params.reasonPublic != "" {
|
|
||||||
q.Set("error_description", params.reasonPublic)
|
|
||||||
}
|
|
||||||
|
|
||||||
if params.state != "" {
|
|
||||||
q.Set("state", params.state)
|
|
||||||
}
|
|
||||||
|
|
||||||
cu.RawQuery = q.Encode()
|
|
||||||
|
|
||||||
if params.json {
|
if params.json {
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
"status": 200,
|
"status": 200,
|
||||||
"redirect_uri": cu.String(),
|
"redirect_uri": redirectUrl,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Redirect(http.StatusFound, cu.String())
|
c.Redirect(http.StatusFound, redirectUrl)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -708,7 +708,7 @@ func TestProxyController(t *testing.T) {
|
|||||||
Log: log,
|
Log: log,
|
||||||
})
|
})
|
||||||
|
|
||||||
authService, err := service.NewAuthService(service.AuthServiceInput{
|
authService := service.NewAuthService(service.AuthServiceInput{
|
||||||
Log: log,
|
Log: log,
|
||||||
Config: &cfg,
|
Config: &cfg,
|
||||||
Runtime: &runtime,
|
Runtime: &runtime,
|
||||||
@@ -721,8 +721,6 @@ func TestProxyController(t *testing.T) {
|
|||||||
PolicyEngine: policyEngine,
|
PolicyEngine: policyEngine,
|
||||||
})
|
})
|
||||||
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
t.Run(test.description, func(t *testing.T) {
|
t.Run(test.description, func(t *testing.T) {
|
||||||
router := gin.Default()
|
router := gin.Default()
|
||||||
|
|||||||
@@ -89,22 +89,30 @@ func (controller *UserController) loginHandler(c *gin.Context) {
|
|||||||
search, err := controller.auth.SearchUser(req.Username)
|
search, err := controller.auth.SearchUser(req.Username)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, service.ErrUserNotFound) {
|
controller.constantTime(func() constantTimeRes {
|
||||||
controller.auth.DummyPasswordCheck(req.Password)
|
if errors.Is(err, service.ErrUserNotFound) {
|
||||||
controller.log.App.Warn().Str("username", req.Username).Msg("User not found during login attempt")
|
controller.log.App.Warn().Str("username", req.Username).Msg("User not found during login attempt")
|
||||||
controller.auth.RecordLoginAttempt(req.Username, false)
|
controller.auth.RecordLoginAttempt(req.Username, false)
|
||||||
controller.log.AuditLoginFailure(req.Username, "unknown", c.ClientIP(), "user not found")
|
controller.log.AuditLoginFailure(req.Username, "unknown", c.ClientIP(), "user not found")
|
||||||
c.JSON(401, gin.H{
|
return constantTimeRes{
|
||||||
"status": 401,
|
Code: 401,
|
||||||
"message": "Unauthorized",
|
Res: gin.H{
|
||||||
})
|
"status": 401,
|
||||||
return
|
"message": "Unauthorized",
|
||||||
}
|
},
|
||||||
controller.log.App.Error().Err(err).Str("username", req.Username).Msg("Error searching for user during login attempt")
|
}
|
||||||
c.JSON(500, gin.H{
|
}
|
||||||
"status": 500,
|
controller.log.App.Error().Err(err).Str("username", req.Username).Msg("Error searching for user during login attempt")
|
||||||
"message": "Internal Server Error",
|
return constantTimeRes{
|
||||||
})
|
Code: 500,
|
||||||
|
Res: gin.H{
|
||||||
|
"status": 500,
|
||||||
|
"message": "Internal Server Error",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}, func(res constantTimeRes) {
|
||||||
|
c.JSON(res.Code, res.Res)
|
||||||
|
}, time.Millisecond*45)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -467,3 +475,18 @@ func (controller *UserController) tailscaleHandler(c *gin.Context) {
|
|||||||
"message": "Login successful",
|
"message": "Login successful",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type constantTimeRes struct {
|
||||||
|
Code int
|
||||||
|
Res any
|
||||||
|
}
|
||||||
|
|
||||||
|
func (controller *UserController) constantTime(f func() constantTimeRes, rf func(res constantTimeRes), targetTime time.Duration) {
|
||||||
|
tStart := time.Now()
|
||||||
|
res := f()
|
||||||
|
tEnd := time.Now()
|
||||||
|
if tEnd.Sub(tStart) < targetTime {
|
||||||
|
time.Sleep(targetTime - tEnd.Sub(tStart))
|
||||||
|
}
|
||||||
|
rf(res)
|
||||||
|
}
|
||||||
|
|||||||
@@ -542,8 +542,7 @@ func TestUserController(t *testing.T) {
|
|||||||
Runtime: &runtime,
|
Runtime: &runtime,
|
||||||
Ctx: ctx,
|
Ctx: ctx,
|
||||||
})
|
})
|
||||||
|
authService := service.NewAuthService(service.AuthServiceInput{
|
||||||
authService, err := service.NewAuthService(service.AuthServiceInput{
|
|
||||||
Log: log,
|
Log: log,
|
||||||
Config: &cfg,
|
Config: &cfg,
|
||||||
Runtime: &runtime,
|
Runtime: &runtime,
|
||||||
@@ -556,8 +555,6 @@ func TestUserController(t *testing.T) {
|
|||||||
PolicyEngine: policyEngine,
|
PolicyEngine: policyEngine,
|
||||||
})
|
})
|
||||||
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
beforeEach := func() {
|
beforeEach := func() {
|
||||||
// Clear failed login attempts before each test
|
// Clear failed login attempts before each test
|
||||||
authService.ClearLoginAttempts()
|
authService.ClearLoginAttempts()
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package middleware
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -245,9 +244,6 @@ func (m *ContextMiddleware) basicAuth(username string, password string) (*model.
|
|||||||
search, err := m.auth.SearchUser(username)
|
search, err := m.auth.SearchUser(username)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, service.ErrUserNotFound) {
|
|
||||||
m.auth.DummyPasswordCheck(password)
|
|
||||||
}
|
|
||||||
return nil, nil, fmt.Errorf("error searching for user: %w", err)
|
return nil, nil, fmt.Errorf("error searching for user: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -264,8 +264,7 @@ func TestContextMiddleware(t *testing.T) {
|
|||||||
Runtime: &runtime,
|
Runtime: &runtime,
|
||||||
Ctx: ctx,
|
Ctx: ctx,
|
||||||
})
|
})
|
||||||
|
authService := service.NewAuthService(service.AuthServiceInput{
|
||||||
authService, err := service.NewAuthService(service.AuthServiceInput{
|
|
||||||
Log: log,
|
Log: log,
|
||||||
Config: &cfg,
|
Config: &cfg,
|
||||||
Runtime: &runtime,
|
Runtime: &runtime,
|
||||||
@@ -278,8 +277,6 @@ func TestContextMiddleware(t *testing.T) {
|
|||||||
PolicyEngine: policyEngine,
|
PolicyEngine: policyEngine,
|
||||||
})
|
})
|
||||||
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
contextMiddleware := NewContextMiddleware(ContextMiddlewareInput{
|
contextMiddleware := NewContextMiddleware(ContextMiddlewareInput{
|
||||||
Log: log,
|
Log: log,
|
||||||
RuntimeConfig: &runtime,
|
RuntimeConfig: &runtime,
|
||||||
|
|||||||
@@ -69,8 +69,6 @@ type AuthService struct {
|
|||||||
tailscale *TailscaleService
|
tailscale *TailscaleService
|
||||||
policyEngine *PolicyEngine
|
policyEngine *PolicyEngine
|
||||||
|
|
||||||
dummyHash string
|
|
||||||
|
|
||||||
lockdown struct {
|
lockdown struct {
|
||||||
active bool
|
active bool
|
||||||
until time.Time
|
until time.Time
|
||||||
@@ -103,7 +101,7 @@ type AuthServiceInput struct {
|
|||||||
PolicyEngine *PolicyEngine
|
PolicyEngine *PolicyEngine
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAuthService(i AuthServiceInput) (*AuthService, error) {
|
func NewAuthService(i AuthServiceInput) *AuthService {
|
||||||
service := &AuthService{
|
service := &AuthService{
|
||||||
log: i.Log,
|
log: i.Log,
|
||||||
runtime: i.Runtime,
|
runtime: i.Runtime,
|
||||||
@@ -125,15 +123,6 @@ func NewAuthService(i AuthServiceInput) (*AuthService, error) {
|
|||||||
loginCacheSize = service.maxLoginLimits
|
loginCacheSize = service.maxLoginLimits
|
||||||
}
|
}
|
||||||
|
|
||||||
// dummy hash
|
|
||||||
dummyHash, err := bcrypt.GenerateFromPassword([]byte(utils.GenerateString(8)), bcrypt.DefaultCost)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to generate dummy hash: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
service.dummyHash = string(dummyHash)
|
|
||||||
|
|
||||||
// caches setup
|
// caches setup
|
||||||
oauthCache := NewCacheStore[OAuthPendingSession](256)
|
oauthCache := NewCacheStore[OAuthPendingSession](256)
|
||||||
loginCache := NewCacheStore[LoginAttempt](loginCacheSize)
|
loginCache := NewCacheStore[LoginAttempt](loginCacheSize)
|
||||||
@@ -159,11 +148,7 @@ func NewAuthService(i AuthServiceInput) (*AuthService, error) {
|
|||||||
}
|
}
|
||||||
}, ding.RingMinor)
|
}, ding.RingMinor)
|
||||||
|
|
||||||
return service, nil
|
return service
|
||||||
}
|
|
||||||
|
|
||||||
func (auth *AuthService) DummyPasswordCheck(password string) {
|
|
||||||
bcrypt.CompareHashAndPassword([]byte(auth.dummyHash), []byte(password))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (auth *AuthService) SearchUser(username string) (*model.UserSearch, error) {
|
func (auth *AuthService) SearchUser(username string) (*model.UserSearch, error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user