Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.

Commit a6515a3

Browse files
author
Andreas Heider
committed
Update dependencies
1 parent 291c7bc commit a6515a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+227
-3968
lines changed

‎Gopkg.lock‎

Lines changed: 2 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[[constraint]]
66
name = "github.com/go-ldap/ldap"
7-
version = "2.5.1"
7+
revision = "0776dae456c9f852c74287dfa8475c16401ac9a9"
88

99
[[constraint]]
1010
branch = "master"
@@ -14,10 +14,6 @@
1414
name = "github.com/hashicorp/vault"
1515
version = "0.10.0"
1616

17-
[[constraint]]
18-
name = "github.com/mgutz/logxi"
19-
version = "1.0.0"
20-
2117
[[constraint]]
2218
name = "gopkg.in/jcmturner/gokrb5.v4"
2319
version = "4.1.2"

‎backend.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kerberos
22

33
import (
4+
"context"
45
"encoding/json"
56
"github.com/hashicorp/vault/logical"
67
"github.com/hashicorp/vault/logical/framework"
@@ -14,15 +15,15 @@ type backend struct {
1415
*framework.Backend
1516
}
1617

17-
func Factory(c *logical.BackendConfig) (logical.Backend, error) {
18-
b := Backend(c)
19-
if err := b.Setup(c); err != nil {
18+
func Factory(ctx context.Context, c *logical.BackendConfig) (logical.Backend, error) {
19+
b := Backend()
20+
if err := b.Setup(ctx, c); err != nil {
2021
return nil, err
2122
}
2223
return b, nil
2324
}
2425

25-
func Backend(c *logical.BackendConfig) *backend {
26+
func Backend() *backend {
2627
b := &backend{}
2728

2829
b.Backend = &framework.Backend{
@@ -46,8 +47,8 @@ func Backend(c *logical.BackendConfig) *backend {
4647
return b
4748
}
4849

49-
func (b *backend) config(s logical.Storage) (*kerberosConfig, error) {
50-
raw, err := s.Get(configPath)
50+
func (b *backend) config(ctx context.Context, s logical.Storage) (*kerberosConfig, error) {
51+
raw, err := s.Get(ctx, configPath)
5152
if err != nil {
5253
return nil, err
5354
}

‎path_config.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kerberos
22

33
import (
4+
"context"
45
"encoding/base64"
56
"errors"
67
"fmt"
@@ -39,8 +40,8 @@ func pathConfig(b *backend) *framework.Path {
3940
}
4041
}
4142

42-
func (b *backend) pathConfigRead(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
43-
if config, err := b.config(req.Storage); err != nil {
43+
func (b *backend) pathConfigRead(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
44+
if config, err := b.config(ctx, req.Storage); err != nil {
4445
return nil, err
4546
} else if config == nil {
4647
return nil, nil
@@ -54,7 +55,7 @@ func (b *backend) pathConfigRead(req *logical.Request, data *framework.FieldData
5455
}
5556
}
5657

57-
func (b *backend) pathConfigWrite(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
58+
func (b *backend) pathConfigWrite(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
5859
serviceAccount := data.Get("service_account").(string)
5960
if serviceAccount == "" {
6061
return nil, errors.New("data does not contain service_account")
@@ -85,7 +86,7 @@ func (b *backend) pathConfigWrite(req *logical.Request, data *framework.FieldDat
8586
return nil, err
8687
}
8788

88-
if err := req.Storage.Put(entry); err != nil {
89+
if err := req.Storage.Put(ctx, entry); err != nil {
8990
return nil, err
9091
}
9192
return nil, nil

‎path_config_ldap.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kerberos
22

33
import (
4+
"context"
45
"crypto/tls"
56
"crypto/x509"
67
"encoding/pem"
@@ -12,11 +13,11 @@ import (
1213

1314
"github.com/fatih/structs"
1415
"github.com/go-ldap/ldap"
16+
log "github.com/hashicorp/go-hclog"
1517
multierror "github.com/hashicorp/go-multierror"
1618
"github.com/hashicorp/vault/helper/tlsutil"
1719
"github.com/hashicorp/vault/logical"
1820
"github.com/hashicorp/vault/logical/framework"
19-
log "github.com/mgutz/logxi/v1"
2021
)
2122

2223
func pathConfigLdap(b *backend) *framework.Path {
@@ -129,7 +130,7 @@ Default: cn`,
129130
/*
130131
* Construct ConfigEntry struct using stored configuration.
131132
*/
132-
func (b *backend) ConfigLdap(req *logical.Request) (*ConfigEntry, error) {
133+
func (b *backend) ConfigLdap(ctx context.Context, req *logical.Request) (*ConfigEntry, error) {
133134
// Schema for ConfigEntry
134135
fd, err := b.getConfigFieldData()
135136
if err != nil {
@@ -142,7 +143,7 @@ func (b *backend) ConfigLdap(req *logical.Request) (*ConfigEntry, error) {
142143
return nil, err
143144
}
144145

145-
storedConfig, err := req.Storage.Get("config/ldap")
146+
storedConfig, err := req.Storage.Get(ctx, "config/ldap")
146147
if err != nil {
147148
return nil, err
148149
}
@@ -163,8 +164,8 @@ func (b *backend) ConfigLdap(req *logical.Request) (*ConfigEntry, error) {
163164
return result, nil
164165
}
165166

166-
func (b *backend) pathConfigLdapRead( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
167-
cfg, err := b.ConfigLdap(req)
167+
func (b *backend) pathConfigLdapRead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
168+
cfg, err := b.ConfigLdap(ctx, req)
168169
if err != nil {
169170
return nil, err
170171
}
@@ -287,7 +288,7 @@ func (b *backend) newConfigEntry(d *framework.FieldData) (*ConfigEntry, error) {
287288
return cfg, nil
288289
}
289290

290-
func (b *backend) pathConfigLdapWrite( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
291+
func (b *backend) pathConfigLdapWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
291292
// Build a ConfigEntry struct out of the supplied FieldData
292293
cfg, err := b.newConfigEntry(d)
293294
if err != nil {
@@ -298,7 +299,7 @@ func (b *backend) pathConfigLdapWrite( /*ctx context.Context, */ req *logical.Re
298299
if err != nil {
299300
return nil, err
300301
}
301-
if err := req.Storage.Put(entry); err != nil {
302+
if err := req.Storage.Put(ctx, entry); err != nil {
302303
return nil, err
303304
}
304305

‎path_config_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package kerberos
22

33
import (
4+
"context"
45
"reflect"
56
"strings"
67
"testing"
78
"time"
89

910
"github.com/hashicorp/vault/logical"
10-
"github.com/mgutz/logxi/v1"
1111
)
1212

1313
func getTestBackend(t *testing.T) (logical.Backend, logical.Storage) {
@@ -23,8 +23,8 @@ func getTestBackend(t *testing.T) (logical.Backend, logical.Storage) {
2323
StorageView: &logical.InmemStorage{},
2424
}
2525

26-
b := Backend(config)
27-
err := b.Setup(config)
26+
b := Backend()
27+
err := b.Setup(context.Background(), config)
2828
if err != nil {
2929
t.Fatalf("unable to create backend: %v", err)
3030
}
@@ -47,7 +47,7 @@ func TestConfig_ReadWrite(t *testing.T) {
4747
Data: data,
4848
}
4949

50-
resp, err := b.HandleRequest(req)
50+
resp, err := b.HandleRequest(context.Background(), req)
5151
if err != nil || (resp != nil && resp.IsError()) {
5252
t.Fatalf("err: %s resp: %#v\n", err, resp)
5353
}
@@ -59,7 +59,7 @@ func TestConfig_ReadWrite(t *testing.T) {
5959
Data: nil,
6060
}
6161

62-
resp, err = b.HandleRequest(req)
62+
resp, err = b.HandleRequest(context.Background(), req)
6363
if err != nil || (resp != nil && resp.IsError()) {
6464
t.Fatalf("err: %s resp: %#v\n", err, resp)
6565
}
@@ -101,7 +101,7 @@ func testConfigWriteError(t *testing.T, b logical.Backend, storage logical.Stora
101101
Data: data,
102102
}
103103

104-
_, err := b.HandleRequest(req)
104+
_, err := b.HandleRequest(context.Background(), req)
105105
if err == nil {
106106
t.Fatal("expected error")
107107
}

‎path_groups.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kerberos
22

33
import (
4-
//"context"
4+
"context"
55

66
"github.com/hashicorp/vault/helper/policyutil"
77
"github.com/hashicorp/vault/logical"
@@ -47,8 +47,8 @@ func pathGroups(b *backend) *framework.Path {
4747
}
4848
}
4949

50-
func (b *backend) Group(s logical.Storage, n string) (*GroupEntry, error) {
51-
entry, err := s.Get("group/" + n)
50+
func (b *backend) Group(ctx context.Context, s logical.Storage, n string) (*GroupEntry, error) {
51+
entry, err := s.Get(ctx, "group/"+n)
5252
if err != nil {
5353
return nil, err
5454
}
@@ -64,17 +64,17 @@ func (b *backend) Group(s logical.Storage, n string) (*GroupEntry, error) {
6464
return &result, nil
6565
}
6666

67-
func (b *backend) pathGroupDelete( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
68-
err := req.Storage.Delete("group/" + d.Get("name").(string))
67+
func (b *backend) pathGroupDelete(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
68+
err := req.Storage.Delete(ctx, "group/"+d.Get("name").(string))
6969
if err != nil {
7070
return nil, err
7171
}
7272

7373
return nil, nil
7474
}
7575

76-
func (b *backend) pathGroupRead( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
77-
group, err := b.Group(req.Storage, d.Get("name").(string))
76+
func (b *backend) pathGroupRead(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
77+
group, err := b.Group(ctx, req.Storage, d.Get("name").(string))
7878
if err != nil {
7979
return nil, err
8080
}
@@ -89,23 +89,23 @@ func (b *backend) pathGroupRead( /*ctx context.Context, */ req *logical.Request,
8989
}, nil
9090
}
9191

92-
func (b *backend) pathGroupWrite( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
92+
func (b *backend) pathGroupWrite(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
9393
// Store it
9494
entry, err := logical.StorageEntryJSON("group/"+d.Get("name").(string), &GroupEntry{
9595
Policies: policyutil.ParsePolicies(d.Get("policies")),
9696
})
9797
if err != nil {
9898
return nil, err
9999
}
100-
if err := req.Storage.Put(entry); err != nil {
100+
if err := req.Storage.Put(ctx, entry); err != nil {
101101
return nil, err
102102
}
103103

104104
return nil, nil
105105
}
106106

107-
func (b *backend) pathGroupList( /*ctx context.Context, */ req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
108-
groups, err := req.Storage.List("group/")
107+
func (b *backend) pathGroupList(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
108+
groups, err := req.Storage.List(ctx, "group/")
109109
if err != nil {
110110
return nil, err
111111
}

‎path_login.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kerberos
22

33
import (
4+
"context"
45
"encoding/base64"
56
"errors"
67
"fmt"
@@ -62,12 +63,12 @@ func spnegoKrb5Authenticate(kt keytab.Keytab, sa string, authorization []byte, r
6263
return false, nil, errors.New("MechToken does not contain an AP_REQ - KRB_AP_ERR_MSG_TYPE")
6364
}
6465

65-
ok, creds, err := service.ValidateAPREQ(mt.APReq, kt, sa, remoteAddr)
66+
ok, creds, err := service.ValidateAPREQ(mt.APReq, kt, sa, remoteAddr, false)
6667
return ok, &creds, err
6768
}
6869

69-
func (b *backend) pathLogin(req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
70-
config, err := b.config(req.Storage)
70+
func (b *backend) pathLogin(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
71+
config, err := b.config(ctx, req.Storage)
7172
if err != nil {
7273
return nil, err
7374
}
@@ -80,7 +81,7 @@ func (b *backend) pathLogin(req *logical.Request, d *framework.FieldData) (*logi
8081
return nil, fmt.Errorf("Could not load keytab: %v", err)
8182
}
8283

83-
ldapConfig, err := b.ConfigLdap(req)
84+
ldapConfig, err := b.ConfigLdap(ctx, req)
8485
if err != nil {
8586
return nil, err
8687
}
@@ -156,7 +157,7 @@ func (b *backend) pathLogin(req *logical.Request, d *framework.FieldData) (*logi
156157
// Retrieve policies
157158
var policies []string
158159
for _, groupName := range allGroups {
159-
group, err := b.Group(req.Storage, groupName)
160+
group, err := b.Group(ctx, req.Storage, groupName)
160161
if err == nil && group != nil {
161162
policies = append(policies, group.Policies...)
162163
}

0 commit comments

Comments
 (0)