Fix possible nil panic

2 files changed, 6 insertions, 0 deletions

diff --git a/app/controllers/ca.go b/app/controllers/ca.go
index c04dcd8..2ad85c5 100644
--- a/app/controllers/ca.go
+++ b/app/controllers/ca.go
@@ -65,6 +65,9 @@ func NewCAHandler(cfg CAHandlerConfig) (*CAHandler, error) {
 
 func (h *CAHandler) authorizeRequest(c echo.Context, certRequest *ssh.Certificate) error {
         session := middleware.GetAuthorizedSession(c)
+        if session == nil {
+                return fmt.Errorf("No authenticated session found")
+        }
 
         user, err := h.Users.Get(c.Request().Context(), session.UserId)
         if err != nil {
diff --git a/app/controllers/proxy.go b/app/controllers/proxy.go
index 0777c93..bc49585 100644
--- a/app/controllers/proxy.go
+++ b/app/controllers/proxy.go
@@ -45,6 +45,9 @@ func getConnectAddr(c echo.Context) string {
 
 func (h *ProxyHandler) authorizeRequest(c echo.Context) error {
         session := middleware.GetAuthorizedSession(c)
+        if session == nil {
+                return fmt.Errorf("No authenticated session found")
+        }
 
         user, err := h.Users.Get(c.Request().Context(), session.UserId)
         if err != nil {