Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gokrb5.config): do not panic on auth_to_local* #550

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:

- name: Copy to gopkg.in in GOPATH
run: |
mkdir -p /home/runner/go/src/gopkg.in/jcmturner/gokrb5.v7
cp -r $GITHUB_WORKSPACE/* /home/runner/go/src/gopkg.in/jcmturner/gokrb5.v7
mkdir -p /home/runner/go/src/gopkg.in/matchaxnb/gokrb5.v7
cp -r $GITHUB_WORKSPACE/* /home/runner/go/src/gopkg.in/matchaxnb/gokrb5.v7
id: gopkg

- name: Get dependencies
Expand All @@ -53,21 +53,21 @@ jobs:

- name: Unit tests
run: |
cd /home/runner/go/src/gopkg.in/jcmturner/gokrb5.v7
cd /home/runner/go/src/gopkg.in/matchaxnb/gokrb5.v7
go test -race $(go list ./... | grep -E -v '/v[0-9]+' | grep -v /vendor/)
id: unitTests

- name: Start integration test dependencies
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq krb5-user
sudo chmod 666 /etc/krb5.conf
sudo docker run -d -h ns.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -e "TEST_KDC_ADDR=${TEST_KDC_ADDR}" -e "TEST_HTTP_ADDR=${TEST_HTTP_ADDR}" -p ${DNSUTILS_OVERRIDE_NS}:53 -p ${DNSUTILS_OVERRIDE_NS}:53/udp --name dns jcmturner/gokrb5:dns
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp -p 464:464 -p 464:464/udp --name krb5kdc jcmturner/gokrb5:kdc-centos-default
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 78:88 -p 78:88/udp --name krb5kdc-old jcmturner/gokrb5:kdc-older
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 98:88 -p 98:88/udp --name krb5kdc-latest jcmturner/gokrb5:kdc-latest
sudo docker run -d -h kdc.resdom.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 188:88 -p 188:88/udp --name krb5kdc-resdom jcmturner/gokrb5:kdc-resdom
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 58:88 -p 58:88/udp --name krb5kdc-shorttickets jcmturner/gokrb5:kdc-shorttickets
sudo docker run -d --add-host host.test.gokrb5:127.0.0.88 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http jcmturner/gokrb5:http
sudo docker run -d -h ns.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -e "TEST_KDC_ADDR=${TEST_KDC_ADDR}" -e "TEST_HTTP_ADDR=${TEST_HTTP_ADDR}" -p ${DNSUTILS_OVERRIDE_NS}:53 -p ${DNSUTILS_OVERRIDE_NS}:53/udp --name dns matchaxnb/gokrb5:dns
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp -p 464:464 -p 464:464/udp --name krb5kdc matchaxnb/gokrb5:kdc-centos-default
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 78:88 -p 78:88/udp --name krb5kdc-old matchaxnb/gokrb5:kdc-older
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 98:88 -p 98:88/udp --name krb5kdc-latest matchaxnb/gokrb5:kdc-latest
sudo docker run -d -h kdc.resdom.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 188:88 -p 188:88/udp --name krb5kdc-resdom matchaxnb/gokrb5:kdc-resdom
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 58:88 -p 58:88/udp --name krb5kdc-shorttickets matchaxnb/gokrb5:kdc-shorttickets
sudo docker run -d --add-host host.test.gokrb5:127.0.0.88 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http matchaxnb/gokrb5:http
sudo sed -i 's/nameserver .*/nameserver '${DNS_IP}'/g' /etc/resolv.conf
dig _kerberos._udp.TEST.GOKRB5
id: intgTestDeps
Expand All @@ -78,7 +78,7 @@ jobs:

- name: Tests including integration tests
run: |
cd /home/runner/go/src/gopkg.in/jcmturner/gokrb5.v7
cd /home/runner/go/src/gopkg.in/matchaxnb/gokrb5.v7
go test -race $(go list ./... | grep -E -v '/v[0-9]+' | grep -v /vendor/)
env:
INTEGRATION: 1
Expand All @@ -87,7 +87,7 @@ jobs:

- name: Tests (32bit)
run: |
cd /home/runner/go/src/gopkg.in/jcmturner/gokrb5.v7
cd /home/runner/go/src/gopkg.in/matchaxnb/gokrb5.v7
go test $(go list ./... | grep -E -v '/v[0-9]+' | grep -v /vendor/)
env:
GOARCH: 386
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/testingv8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ jobs:
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq krb5-user
sudo chmod 666 /etc/krb5.conf
sudo docker run -d -h ns.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -e "TEST_KDC_ADDR=${TEST_KDC_ADDR}" -e "TEST_HTTP_ADDR=${TEST_HTTP_ADDR}" -p ${DNSUTILS_OVERRIDE_NS}:53 -p ${DNSUTILS_OVERRIDE_NS}:53/udp --name dns jcmturner/gokrb5:dns
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp -p 464:464 -p 464:464/udp --name krb5kdc jcmturner/gokrb5:kdc-centos-default
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 78:88 -p 78:88/udp --name krb5kdc-old jcmturner/gokrb5:kdc-older
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 98:88 -p 98:88/udp --name krb5kdc-latest jcmturner/gokrb5:kdc-latest
sudo docker run -d -h kdc.resdom.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 188:88 -p 188:88/udp --name krb5kdc-resdom jcmturner/gokrb5:kdc-resdom
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 58:88 -p 58:88/udp --name krb5kdc-shorttickets jcmturner/gokrb5:kdc-shorttickets
sudo docker run -d --add-host host.test.gokrb5:127.0.0.88 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http jcmturner/gokrb5:http
sudo docker run -d -h ns.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -e "TEST_KDC_ADDR=${TEST_KDC_ADDR}" -e "TEST_HTTP_ADDR=${TEST_HTTP_ADDR}" -p ${DNSUTILS_OVERRIDE_NS}:53 -p ${DNSUTILS_OVERRIDE_NS}:53/udp --name dns matchaxnb/gokrb5:dns
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp -p 464:464 -p 464:464/udp --name krb5kdc matchaxnb/gokrb5:kdc-centos-default
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 78:88 -p 78:88/udp --name krb5kdc-old matchaxnb/gokrb5:kdc-older
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 98:88 -p 98:88/udp --name krb5kdc-latest matchaxnb/gokrb5:kdc-latest
sudo docker run -d -h kdc.resdom.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 188:88 -p 188:88/udp --name krb5kdc-resdom matchaxnb/gokrb5:kdc-resdom
sudo docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 58:88 -p 58:88/udp --name krb5kdc-shorttickets matchaxnb/gokrb5:kdc-shorttickets
sudo docker run -d --add-host host.test.gokrb5:127.0.0.88 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http matchaxnb/gokrb5:http
sudo sed -i 's/nameserver .*/nameserver '${DNS_IP}'/g' /etc/resolv.conf
dig _kerberos._udp.TEST.GOKRB5
id: intgTestDeps
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ It is recommended to run tests with the ```-race``` argument.
There are integration tests that run against various other network services such as KDCs, HTTP web servers, DNS servers,
etc. To run these pass ```-tags=integration``` as an argument to the go test command.
There are vagrant and docker resources available to spin up these network services. See the
[readme](https://github.com/jcmturner/gokrb5/blob/master/testenv/README.md) in the testenv directory for instructions.
[readme](https://github.com/matchaxnb/gokrb5/blob/master/testenv/README.md) in the testenv directory for instructions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# gokrb5

It is recommended to use the latest version: [![Version](https://img.shields.io/github/release/jcmturner/gokrb5.svg)](https://github.com/jcmturner/gokrb5/releases)
It is recommended to use the latest version: [![Version](https://img.shields.io/github/release/matchaxnb/gokrb5.svg)](https://github.com/matchaxnb/gokrb5/releases)

Development will be focused on the latest major version. New features will only be targeted at this version.

| Versions | Dependency Management | Import Path | Usage | Godoc | Go Report Card |
|----------|-----------------------|-------------|-------|-------|----------------|
| [![v8](https://github.com/jcmturner/gokrb5/workflows/v8/badge.svg)](https://github.com/jcmturner/gokrb5/actions?query=workflow%3Av8) | Go modules | import "github.com/jcmturner/gokrb5/v8/{sub-package}" | [![Usage](https://img.shields.io/badge/v8-usage-blue)](https://github.com/jcmturner/gokrb5/blob/master/v8/USAGE.md) | [![GoDoc](https://img.shields.io/badge/godoc-reference-blue)](https://pkg.go.dev/github.com/jcmturner/gokrb5/v8) | [![Go Report Card](https://goreportcard.com/badge/github.com/jcmturner/gokrb5/v8)](https://goreportcard.com/report/github.com/jcmturner/gokrb5/v8) |
| [![v7](https://github.com/jcmturner/gokrb5/workflows/v7/badge.svg)](https://github.com/jcmturner/gokrb5/actions?query=workflow%3Av7) | gopkg.in | import "gopkg.in/jcmturner/gokrb5.v7/{sub-package}" | [![Usage](https://img.shields.io/badge/v7-usage-blue)](https://github.com/jcmturner/gokrb5/blob/master/USAGE.md) | [![GoDoc](https://img.shields.io/badge/godoc-reference-blue)](https://pkg.go.dev/github.com/jcmturner/[email protected]+incompatible) | [![Go Report Card](https://goreportcard.com/badge/gopkg.in/jcmturner/gokrb5.v7)](https://goreportcard.com/report/gopkg.in/jcmturner/gokrb5.v7) |
| [![v8](https://github.com/matchaxnb/gokrb5/workflows/v8/badge.svg)](https://github.com/matchaxnb/gokrb5/actions?query=workflow%3Av8) | Go modules | import "github.com/matchaxnb/gokrb5/v8/{sub-package}" | [![Usage](https://img.shields.io/badge/v8-usage-blue)](https://github.com/matchaxnb/gokrb5/blob/master/v8/USAGE.md) | [![GoDoc](https://img.shields.io/badge/godoc-reference-blue)](https://pkg.go.dev/github.com/matchaxnb/gokrb5/v8) | [![Go Report Card](https://goreportcard.com/badge/github.com/matchaxnb/gokrb5/v8)](https://goreportcard.com/report/github.com/matchaxnb/gokrb5/v8) |
| [![v7](https://github.com/matchaxnb/gokrb5/workflows/v7/badge.svg)](https://github.com/matchaxnb/gokrb5/actions?query=workflow%3Av7) | gopkg.in | import "gopkg.in/matchaxnb/gokrb5.v7/{sub-package}" | [![Usage](https://img.shields.io/badge/v7-usage-blue)](https://github.com/matchaxnb/gokrb5/blob/master/USAGE.md) | [![GoDoc](https://img.shields.io/badge/godoc-reference-blue)](https://pkg.go.dev/github.com/matchaxnb/[email protected]+incompatible) | [![Go Report Card](https://goreportcard.com/badge/gopkg.in/matchaxnb/gokrb5.v7)](https://goreportcard.com/report/gopkg.in/matchaxnb/gokrb5.v7) |


#### Go Version Support
Expand Down Expand Up @@ -52,7 +52,7 @@ The following is working/tested:
* Microsoft PAC Authorization Data is processed and exposed in the HTTP request context. Available if Microsoft Active Directory is used as the KDC.

## Contributing
If you are interested in contributing to gokrb5, great! Please read the [contribution guidelines](https://github.com/jcmturner/gokrb5/blob/master/CONTRIBUTING.md).
If you are interested in contributing to gokrb5, great! Please read the [contribution guidelines](https://github.com/matchaxnb/gokrb5/blob/master/CONTRIBUTING.md).

---

Expand Down Expand Up @@ -83,7 +83,7 @@ If you are interested in contributing to gokrb5, great! Please read the [contrib

## Contributing
Thank you for your interest in contributing to gokrb5 please read the
[contribution guide](https://github.com/jcmturner/gokrb5/blob/master/CONTRIBUTING.md) as it should help you get started.
[contribution guide](https://github.com/matchaxnb/gokrb5/blob/master/CONTRIBUTING.md) as it should help you get started.

## Known Issues
| Issue | Worked around? | References |
Expand Down
8 changes: 4 additions & 4 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ major version sub-directory.
The gokrb5 libraries use the same krb5.conf configuration file format as MIT Kerberos, described [here](https://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/krb5_conf.html).
Config instances can be created by loading from a file path or by passing a string, io.Reader or bufio.Scanner to the relevant method:
```go
import "gopkg.in/jcmturner/gokrb5.v7/config"
import "gopkg.in/matchaxnb/gokrb5.v7/config"
cfg, err := config.Load("/path/to/config/file")
cfg, err := config.NewConfigFromString(krb5Str) //String must have appropriate newline separations
cfg, err := config.NewConfigFromReader(reader)
Expand All @@ -16,7 +16,7 @@ cfg, err := config.NewConfigFromScanner(scanner)
### Keytab files
Standard keytab files can be read from a file or from a slice of bytes:
```go
import "gopkg.in/jcmturner/gokrb5.v7/keytab"
import "gopkg.in/matchaxnb/gokrb5.v7/keytab"
ktFromFile, err := keytab.Load("/path/to/file.keytab")
ktFromBytes, err := keytab.Parse(b)

Expand All @@ -28,7 +28,7 @@ ktFromBytes, err := keytab.Parse(b)
**Create** a client instance with either a password or a keytab.
A configuration must also be passed. Additionally optional additional settings can be provided.
```go
import "gopkg.in/jcmturner/gokrb5.v7/client"
import "gopkg.in/matchaxnb/gokrb5.v7/client"
cl := client.NewClientWithPassword("username", "REALM.COM", "password", cfg)
cl := client.NewClientWithKeytab("username", "REALM.COM", kt, cfg)
```
Expand Down Expand Up @@ -192,7 +192,7 @@ if validuser, ok := ctx.Value(spnego.CTXKeyAuthenticated).(bool); ok && validuse
#### Generic Kerberised Service - Validating Client Details
To validate the AP_REQ sent by the client on the service side call this method:
```go
import "gopkg.in/jcmturner/gokrb5.v7/service"
import "gopkg.in/matchaxnb/gokrb5.v7/service"
s := service.NewSettings(&kt) // kt is a keytab and optional settings can also be provided.
if ok, creds, err := service.VerifyAPREQ(APReq, s); ok {
// Perform application specific actions
Expand Down
16 changes: 8 additions & 8 deletions client/ASExchange.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package client

import (
"gopkg.in/jcmturner/gokrb5.v7/crypto"
"gopkg.in/jcmturner/gokrb5.v7/crypto/etype"
"gopkg.in/jcmturner/gokrb5.v7/iana/errorcode"
"gopkg.in/jcmturner/gokrb5.v7/iana/keyusage"
"gopkg.in/jcmturner/gokrb5.v7/iana/patype"
"gopkg.in/jcmturner/gokrb5.v7/krberror"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/crypto"
"gopkg.in/matchaxnb/gokrb5.v7/crypto/etype"
"gopkg.in/matchaxnb/gokrb5.v7/iana/errorcode"
"gopkg.in/matchaxnb/gokrb5.v7/iana/keyusage"
"gopkg.in/matchaxnb/gokrb5.v7/iana/patype"
"gopkg.in/matchaxnb/gokrb5.v7/krberror"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/types"
)

// ASExchange performs an AS exchange for the client to retrieve a TGT.
Expand Down
10 changes: 5 additions & 5 deletions client/TGSExchange.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package client

import (
"gopkg.in/jcmturner/gokrb5.v7/iana/flags"
"gopkg.in/jcmturner/gokrb5.v7/iana/nametype"
"gopkg.in/jcmturner/gokrb5.v7/krberror"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/iana/flags"
"gopkg.in/matchaxnb/gokrb5.v7/iana/nametype"
"gopkg.in/matchaxnb/gokrb5.v7/krberror"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/types"
)

// TGSREQGenerateAndExchange generates the TGS_REQ and performs a TGS exchange to retrieve a ticket to the specified SPN.
Expand Down
4 changes: 2 additions & 2 deletions client/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"sync"
"time"

"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/types"
)

// Cache for service tickets held by the client.
Expand Down
20 changes: 10 additions & 10 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"fmt"
"time"

"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/credentials"
"gopkg.in/jcmturner/gokrb5.v7/crypto"
"gopkg.in/jcmturner/gokrb5.v7/crypto/etype"
"gopkg.in/jcmturner/gokrb5.v7/iana/errorcode"
"gopkg.in/jcmturner/gokrb5.v7/iana/nametype"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/jcmturner/gokrb5.v7/krberror"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/credentials"
"gopkg.in/matchaxnb/gokrb5.v7/crypto"
"gopkg.in/matchaxnb/gokrb5.v7/crypto/etype"
"gopkg.in/matchaxnb/gokrb5.v7/iana/errorcode"
"gopkg.in/matchaxnb/gokrb5.v7/iana/nametype"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/krberror"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/types"
)

// Client side configuration and state.
Expand Down
14 changes: 7 additions & 7 deletions client/client_ad_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"log"

"github.com/stretchr/testify/assert"
"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/iana/etypeID"
"gopkg.in/jcmturner/gokrb5.v7/iana/nametype"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/jcmturner/gokrb5.v7/test"
"gopkg.in/jcmturner/gokrb5.v7/test/testdata"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/iana/etypeID"
"gopkg.in/matchaxnb/gokrb5.v7/iana/nametype"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/test"
"gopkg.in/matchaxnb/gokrb5.v7/test/testdata"
"gopkg.in/matchaxnb/gokrb5.v7/types"

"testing"
)
Expand Down
8 changes: 4 additions & 4 deletions client/client_dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package client

import (
"encoding/hex"
"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/jcmturner/gokrb5.v7/test"
"gopkg.in/jcmturner/gokrb5.v7/test/testdata"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/test"
"gopkg.in/matchaxnb/gokrb5.v7/test/testdata"
"testing"
)

Expand Down
16 changes: 8 additions & 8 deletions client/client_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (

"fmt"
"github.com/stretchr/testify/assert"
"gopkg.in/jcmturner/gokrb5.v7/client"
"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/credentials"
"gopkg.in/jcmturner/gokrb5.v7/iana/etypeID"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/jcmturner/gokrb5.v7/spnego"
"gopkg.in/jcmturner/gokrb5.v7/test"
"gopkg.in/jcmturner/gokrb5.v7/test/testdata"
"gopkg.in/matchaxnb/gokrb5.v7/client"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/credentials"
"gopkg.in/matchaxnb/gokrb5.v7/iana/etypeID"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/spnego"
"gopkg.in/matchaxnb/gokrb5.v7/test"
"gopkg.in/matchaxnb/gokrb5.v7/test/testdata"
"strings"
"sync"
)
Expand Down
4 changes: 2 additions & 2 deletions client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"testing"

"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
)

func TestAssumePreauthentication(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions client/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net"
"time"

"gopkg.in/jcmturner/gokrb5.v7/iana/errorcode"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/iana/errorcode"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
)

// SendToKDC performs network actions to send data to the KDC.
Expand Down
4 changes: 2 additions & 2 deletions client/passwd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net"

"gopkg.in/jcmturner/gokrb5.v7/kadmin"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/kadmin"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
)

// Kpasswd server response codes.
Expand Down
8 changes: 4 additions & 4 deletions client/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"sync"
"time"

"gopkg.in/jcmturner/gokrb5.v7/iana/nametype"
"gopkg.in/jcmturner/gokrb5.v7/krberror"
"gopkg.in/jcmturner/gokrb5.v7/messages"
"gopkg.in/jcmturner/gokrb5.v7/types"
"gopkg.in/matchaxnb/gokrb5.v7/iana/nametype"
"gopkg.in/matchaxnb/gokrb5.v7/krberror"
"gopkg.in/matchaxnb/gokrb5.v7/messages"
"gopkg.in/matchaxnb/gokrb5.v7/types"
)

// sessions hold TGTs and are keyed on the realm name
Expand Down
10 changes: 5 additions & 5 deletions client/session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"time"

"github.com/stretchr/testify/assert"
"gopkg.in/jcmturner/gokrb5.v7/config"
"gopkg.in/jcmturner/gokrb5.v7/iana/etypeID"
"gopkg.in/jcmturner/gokrb5.v7/keytab"
"gopkg.in/jcmturner/gokrb5.v7/test"
"gopkg.in/jcmturner/gokrb5.v7/test/testdata"
"gopkg.in/matchaxnb/gokrb5.v7/config"
"gopkg.in/matchaxnb/gokrb5.v7/iana/etypeID"
"gopkg.in/matchaxnb/gokrb5.v7/keytab"
"gopkg.in/matchaxnb/gokrb5.v7/test"
"gopkg.in/matchaxnb/gokrb5.v7/test/testdata"
)

func TestMultiThreadedClientSession(t *testing.T) {
Expand Down
Loading