From 46620c87b7659e641a7a3e05530dbd3040a2ce8c Mon Sep 17 00:00:00 2001
From: Bolke de Bruin <bolke@xs4all.nl>
Date: Mon, 18 Mar 2024 15:27:30 +0100
Subject: [PATCH] upgrades
---
cmd/auth/auth.go | 11 +++++++++--
go.mod | 4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cmd/auth/auth.go b/cmd/auth/auth.go
index 2f051ec..0fe6aba 100644
--- a/cmd/auth/auth.go
+++ b/cmd/auth/auth.go
@@ -3,8 +3,9 @@ package main
import (
"context"
"errors"
+ "fmt"
"github.com/bolkedebruin/rdpgw/shared/auth"
- "github.com/msteinert/pam"
+ "github.com/msteinert/pam/v2"
"github.com/thought-machine/go-flags"
"google.golang.org/grpc"
"log"
@@ -52,7 +53,13 @@ func (s *AuthServiceImpl) Authenticate(ctx context.Context, message *auth.UserPa
r.Error = err.Error()
return r, err
}
-
+ defer func() {
+ err := t.End()
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "end: %v\n", err)
+ os.Exit(1)
+ }
+ }()
if err = t.Authenticate(0); err != nil {
log.Printf("Authentication for user: %s failed due to: %s", message.Username, err)
r.Error = err.Error()
diff --git a/go.mod b/go.mod
index ec9fe6a..2d63b30 100644
--- a/go.mod
+++ b/go.mod
@@ -18,10 +18,10 @@ require (
github.com/knadh/koanf/providers/env v0.1.0
github.com/knadh/koanf/providers/file v0.1.0
github.com/knadh/koanf/v2 v2.1.0
- github.com/msteinert/pam v1.2.0
+ github.com/msteinert/pam/v2 v2.0.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.19.0
- github.com/stretchr/testify v1.8.1
+ github.com/stretchr/testify v1.9.0
github.com/thought-machine/go-flags v1.6.3
golang.org/x/crypto v0.21.0
golang.org/x/oauth2 v0.18.0
--
GitLab