From ab226d925aa394ccecf01e515ea8479367e0961c Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Sat, 15 Aug 2020 15:40:41 +0300
Subject: [PATCH] fix https://github.com/kataras/iris/issues/1590

---
 middleware/basicauth/basicauth.go | 12 +++++++++++-
 middleware/basicauth/config.go    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/middleware/basicauth/basicauth.go b/middleware/basicauth/basicauth.go
index 79831dfb..d7548530 100644
--- a/middleware/basicauth/basicauth.go
+++ b/middleware/basicauth/basicauth.go
@@ -6,6 +6,7 @@ package basicauth
 import (
 	"encoding/base64"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/kataras/iris/v12"
@@ -22,6 +23,7 @@ type (
 		Username    string
 		logged      bool
 		expires     time.Time
+		mu          sync.RWMutex
 	}
 	encodedUsers []*encodedUser
 
@@ -117,11 +119,19 @@ func (b *basicAuthMiddleware) Serve(ctx *context.Context) {
 	// all ok
 	if b.expireEnabled {
 		if !auth.logged {
+			auth.mu.Lock()
 			auth.expires = time.Now().Add(b.config.Expires)
 			auth.logged = true
+			auth.mu.Unlock()
 		}
 
-		if time.Now().After(auth.expires) {
+		auth.mu.RLock()
+		expired := time.Now().After(auth.expires)
+		auth.mu.RUnlock()
+		if expired {
+			auth.mu.Lock()
+			auth.logged = false
+			auth.mu.Unlock()
 			b.askForCredentials(ctx) // ask for authentication again
 			ctx.StopExecution()
 			return
diff --git a/middleware/basicauth/config.go b/middleware/basicauth/config.go
index 3b885b14..2a4758c5 100644
--- a/middleware/basicauth/config.go
+++ b/middleware/basicauth/config.go
@@ -20,7 +20,7 @@ type Config struct {
 	Users map[string]string
 	// Realm http://tools.ietf.org/html/rfc2617#section-1.2. Default is "Authorization Required"
 	Realm string
-	// Expires expiration duration, default is 0 never expires
+	// Expires expiration duration, default is 0 never expires.
 	Expires time.Duration
 
 	// OnAsk fires each time the server asks to the client for credentials in order to gain access and continue to the next handler.