From b9e73370f9fee82e93c330566f86fec08f00a35e Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sat, 5 Dec 2020 17:36:50 +0100 Subject: [PATCH] updated dependencies --- go.mod | 52 +- go.sum | 138 + vendor/github.com/alexbrainman/sspi/LICENSE | 27 - vendor/github.com/alexbrainman/sspi/README.md | 1 - vendor/github.com/alexbrainman/sspi/buffer.go | 57 - .../github.com/alexbrainman/sspi/mksyscall.go | 7 - .../alexbrainman/sspi/negotiate/negotiate.go | 462 - vendor/github.com/alexbrainman/sspi/sspi.go | 226 - .../github.com/alexbrainman/sspi/syscall.go | 174 - .../alexbrainman/sspi/zsyscall_windows.go | 152 - .../github.com/antchfx/htmlquery/.travis.yml | 7 +- vendor/github.com/antchfx/htmlquery/README.md | 102 +- vendor/github.com/antchfx/htmlquery/cache.go | 42 + vendor/github.com/antchfx/htmlquery/go.mod | 9 + vendor/github.com/antchfx/htmlquery/go.sum | 11 + vendor/github.com/antchfx/htmlquery/query.go | 83 +- vendor/github.com/antchfx/xpath/README.md | 6 + vendor/github.com/antchfx/xpath/build.go | 78 +- vendor/github.com/antchfx/xpath/cache.go | 80 + vendor/github.com/antchfx/xpath/func.go | 252 +- vendor/github.com/antchfx/xpath/func_go110.go | 9 +- .../antchfx/xpath/func_pre_go110.go | 9 +- vendor/github.com/antchfx/xpath/go.mod | 3 + vendor/github.com/antchfx/xpath/operator.go | 12 +- vendor/github.com/antchfx/xpath/query.go | 143 +- vendor/github.com/antchfx/xpath/xpath.go | 6 +- vendor/github.com/gobuffalo/here/dir.go | 9 +- vendor/github.com/gobuffalo/here/go.mod | 8 +- vendor/github.com/gobuffalo/here/go.sum | 19 +- vendor/github.com/gobuffalo/here/here.go | 4 +- vendor/github.com/gobuffalo/here/parse.go | 1 + vendor/github.com/gobuffalo/here/pkg.go | 2 +- vendor/github.com/golang/groupcache/LICENSE | 191 + .../github.com/golang/groupcache/lru/lru.go | 133 + vendor/github.com/golang/snappy/AUTHORS | 2 + vendor/github.com/golang/snappy/CONTRIBUTORS | 2 + vendor/github.com/golang/snappy/decode.go | 4 + .../github.com/golang/snappy/decode_arm64.s | 503 ++ .../snappy/{decode_amd64.go => decode_asm.go} | 1 + .../github.com/golang/snappy/decode_other.go | 24 +- vendor/github.com/golang/snappy/encode.go | 4 + .../github.com/golang/snappy/encode_arm64.s | 729 ++ .../snappy/{encode_amd64.go => encode_asm.go} | 1 + .../github.com/golang/snappy/encode_other.go | 2 +- vendor/github.com/golang/snappy/go.mod | 1 + .../github.com/hashicorp/go-uuid/.travis.yml | 12 - vendor/github.com/hashicorp/go-uuid/LICENSE | 363 - vendor/github.com/hashicorp/go-uuid/README.md | 8 - vendor/github.com/hashicorp/go-uuid/go.mod | 1 - vendor/github.com/hashicorp/go-uuid/uuid.go | 83 - vendor/github.com/jcmturner/aescts/v2/LICENSE | 201 - .../github.com/jcmturner/aescts/v2/aescts.go | 186 - vendor/github.com/jcmturner/aescts/v2/go.mod | 5 - vendor/github.com/jcmturner/aescts/v2/go.sum | 10 - .../github.com/jcmturner/dnsutils/v2/LICENSE | 201 - .../github.com/jcmturner/dnsutils/v2/go.mod | 5 - .../github.com/jcmturner/dnsutils/v2/go.sum | 10 - .../github.com/jcmturner/dnsutils/v2/srv.go | 95 - vendor/github.com/jcmturner/gofork/LICENSE | 27 - .../jcmturner/gofork/encoding/asn1/README.md | 5 - .../jcmturner/gofork/encoding/asn1/asn1.go | 1003 --- .../jcmturner/gofork/encoding/asn1/common.go | 173 - .../jcmturner/gofork/encoding/asn1/marshal.go | 659 -- .../gofork/x/crypto/pbkdf2/pbkdf2.go | 98 - .../jcmturner/goidentity/v6/LICENSE | 201 - .../jcmturner/goidentity/v6/README.md | 7 - .../jcmturner/goidentity/v6/authenticator.go | 6 - .../github.com/jcmturner/goidentity/v6/go.mod | 8 - .../github.com/jcmturner/goidentity/v6/go.sum | 12 - .../jcmturner/goidentity/v6/identity.go | 52 - .../jcmturner/goidentity/v6/user.go | 172 - vendor/github.com/jcmturner/gokrb5/v8/LICENSE | 201 - .../jcmturner/gokrb5/v8/asn1tools/tools.go | 86 - .../jcmturner/gokrb5/v8/client/ASExchange.go | 182 - .../jcmturner/gokrb5/v8/client/TGSExchange.go | 103 - .../jcmturner/gokrb5/v8/client/cache.go | 134 - .../jcmturner/gokrb5/v8/client/client.go | 329 - .../jcmturner/gokrb5/v8/client/network.go | 213 - .../jcmturner/gokrb5/v8/client/passwd.go | 95 - .../jcmturner/gokrb5/v8/client/session.go | 295 - .../jcmturner/gokrb5/v8/client/settings.go | 93 - .../jcmturner/gokrb5/v8/config/error.go | 30 - .../jcmturner/gokrb5/v8/config/hosts.go | 141 - .../jcmturner/gokrb5/v8/config/krb5conf.go | 728 -- .../jcmturner/gokrb5/v8/credentials/ccache.go | 333 - .../gokrb5/v8/credentials/credentials.go | 405 - .../v8/crypto/aes128-cts-hmac-sha1-96.go | 129 - .../v8/crypto/aes128-cts-hmac-sha256-128.go | 132 - .../v8/crypto/aes256-cts-hmac-sha1-96.go | 129 - .../v8/crypto/aes256-cts-hmac-sha384-192.go | 132 - .../gokrb5/v8/crypto/common/common.go | 132 - .../jcmturner/gokrb5/v8/crypto/crypto.go | 175 - .../gokrb5/v8/crypto/des3-cbc-sha1-kd.go | 139 - .../jcmturner/gokrb5/v8/crypto/etype/etype.go | 29 - .../jcmturner/gokrb5/v8/crypto/rc4-hmac.go | 133 - .../gokrb5/v8/crypto/rfc3961/encryption.go | 119 - .../gokrb5/v8/crypto/rfc3961/keyDerivation.go | 169 - .../gokrb5/v8/crypto/rfc3961/nfold.go | 107 - .../gokrb5/v8/crypto/rfc3962/encryption.go | 89 - .../gokrb5/v8/crypto/rfc3962/keyDerivation.go | 51 - .../gokrb5/v8/crypto/rfc4757/checksum.go | 40 - .../gokrb5/v8/crypto/rfc4757/encryption.go | 80 - .../gokrb5/v8/crypto/rfc4757/keyDerivation.go | 40 - .../gokrb5/v8/crypto/rfc4757/msgtype.go | 20 - .../gokrb5/v8/crypto/rfc8009/encryption.go | 125 - .../gokrb5/v8/crypto/rfc8009/keyDerivation.go | 135 - .../jcmturner/gokrb5/v8/gssapi/MICToken.go | 174 - .../jcmturner/gokrb5/v8/gssapi/README.md | 20 - .../gokrb5/v8/gssapi/contextFlags.go | 25 - .../jcmturner/gokrb5/v8/gssapi/gssapi.go | 202 - .../jcmturner/gokrb5/v8/gssapi/wrapToken.go | 193 - .../gokrb5/v8/iana/addrtype/constants.go | 15 - .../gokrb5/v8/iana/adtype/constants.go | 23 - .../gokrb5/v8/iana/asnAppTag/constants.go | 24 - .../gokrb5/v8/iana/chksumtype/constants.go | 32 - .../jcmturner/gokrb5/v8/iana/constants.go | 5 - .../gokrb5/v8/iana/errorcode/constants.go | 155 - .../gokrb5/v8/iana/etypeID/constants.go | 101 - .../gokrb5/v8/iana/flags/constants.go | 36 - .../gokrb5/v8/iana/keyusage/constants.go | 42 - .../gokrb5/v8/iana/msgtype/constants.go | 18 - .../gokrb5/v8/iana/nametype/constants.go | 15 - .../gokrb5/v8/iana/patype/constants.go | 77 - .../gokrb5/v8/kadmin/changepasswddata.go | 23 - .../jcmturner/gokrb5/v8/kadmin/message.go | 114 - .../jcmturner/gokrb5/v8/kadmin/passwd.go | 68 - .../jcmturner/gokrb5/v8/keytab/keytab.go | 470 - .../jcmturner/gokrb5/v8/krberror/error.go | 67 - .../jcmturner/gokrb5/v8/messages/APRep.go | 49 - .../jcmturner/gokrb5/v8/messages/APReq.go | 199 - .../jcmturner/gokrb5/v8/messages/KDCRep.go | 308 - .../jcmturner/gokrb5/v8/messages/KDCReq.go | 432 - .../jcmturner/gokrb5/v8/messages/KRBCred.go | 102 - .../jcmturner/gokrb5/v8/messages/KRBError.go | 83 - .../jcmturner/gokrb5/v8/messages/KRBPriv.go | 108 - .../jcmturner/gokrb5/v8/messages/KRBSafe.go | 43 - .../jcmturner/gokrb5/v8/messages/Ticket.go | 265 - .../jcmturner/gokrb5/v8/pac/client_claims.go | 33 - .../jcmturner/gokrb5/v8/pac/client_info.go | 31 - .../gokrb5/v8/pac/credentials_info.go | 82 - .../jcmturner/gokrb5/v8/pac/device_claims.go | 33 - .../jcmturner/gokrb5/v8/pac/device_info.go | 32 - .../gokrb5/v8/pac/kerb_validation_info.go | 110 - .../jcmturner/gokrb5/v8/pac/pac_type.go | 251 - .../gokrb5/v8/pac/s4u_delegation_info.go | 26 - .../jcmturner/gokrb5/v8/pac/signature_data.go | 67 - .../gokrb5/v8/pac/supplemental_cred.go | 87 - .../jcmturner/gokrb5/v8/pac/upn_dns_info.go | 73 - .../jcmturner/gokrb5/v8/service/APExchange.go | 61 - .../gokrb5/v8/service/authenticator.go | 118 - .../jcmturner/gokrb5/v8/service/cache.go | 128 - .../jcmturner/gokrb5/v8/service/settings.go | 163 - .../jcmturner/gokrb5/v8/spnego/http.go | 373 - .../jcmturner/gokrb5/v8/spnego/krb5Token.go | 218 - .../gokrb5/v8/spnego/negotiationToken.go | 302 - .../jcmturner/gokrb5/v8/spnego/spnego.go | 203 - .../gokrb5/v8/types/Authenticator.go | 81 - .../gokrb5/v8/types/AuthorizationData.go | 55 - .../jcmturner/gokrb5/v8/types/Cryptosystem.go | 55 - .../jcmturner/gokrb5/v8/types/HostAddress.go | 180 - .../gokrb5/v8/types/KerberosFlags.go | 68 - .../jcmturner/gokrb5/v8/types/PAData.go | 155 - .../gokrb5/v8/types/PrincipalName.go | 64 - .../jcmturner/gokrb5/v8/types/TypedData.go | 18 - vendor/github.com/jcmturner/rpc/v2/LICENSE | 201 - .../jcmturner/rpc/v2/mstypes/claims.go | 152 - .../jcmturner/rpc/v2/mstypes/common.go | 12 - .../jcmturner/rpc/v2/mstypes/filetime.go | 52 - .../rpc/v2/mstypes/group_membership.go | 19 - .../rpc/v2/mstypes/kerb_sid_and_attributes.go | 23 - .../jcmturner/rpc/v2/mstypes/reader.go | 109 - .../rpc/v2/mstypes/rpc_unicode_string.go | 13 - .../jcmturner/rpc/v2/mstypes/sid.go | 32 - .../rpc/v2/mstypes/user_session_key.go | 11 - .../github.com/jcmturner/rpc/v2/ndr/arrays.go | 413 - .../jcmturner/rpc/v2/ndr/decoder.go | 393 - .../github.com/jcmturner/rpc/v2/ndr/error.go | 18 - .../github.com/jcmturner/rpc/v2/ndr/header.go | 116 - .../github.com/jcmturner/rpc/v2/ndr/pipe.go | 31 - .../jcmturner/rpc/v2/ndr/primitives.go | 211 - .../jcmturner/rpc/v2/ndr/rawbytes.go | 61 - .../jcmturner/rpc/v2/ndr/strings.go | 70 - .../github.com/jcmturner/rpc/v2/ndr/tags.go | 69 - .../github.com/jcmturner/rpc/v2/ndr/union.go | 57 - .../github.com/labstack/echo/v4/.travis.yml | 4 +- vendor/github.com/labstack/echo/v4/README.md | 4 +- vendor/github.com/labstack/echo/v4/echo.go | 34 +- vendor/github.com/labstack/echo/v4/go.mod | 13 +- vendor/github.com/labstack/echo/v4/go.sum | 26 +- vendor/github.com/labstack/echo/v4/group.go | 2 +- vendor/github.com/labstack/echo/v4/router.go | 4 + vendor/github.com/lib/pq/.gitignore | 2 + vendor/github.com/lib/pq/.travis.yml | 3 +- vendor/github.com/lib/pq/array.go | 139 + vendor/github.com/lib/pq/conn.go | 129 +- vendor/github.com/lib/pq/conn_go18.go | 22 +- vendor/github.com/lib/pq/connector.go | 2 +- vendor/github.com/lib/pq/copy.go | 29 +- vendor/github.com/lib/pq/doc.go | 25 +- vendor/github.com/lib/pq/error.go | 11 +- vendor/github.com/lib/pq/go.mod | 11 - vendor/github.com/lib/pq/krb.go | 51 +- vendor/github.com/lib/pq/krb_unix.go | 123 - vendor/github.com/lib/pq/krb_windows.go | 61 - vendor/github.com/markbates/pkger/README.md | 41 +- .../github.com/markbates/pkger/here/here.go | 14 + .../markbates/pkger/internal/maps/files.go | 2 +- .../markbates/pkger/internal/maps/infos.go | 2 +- vendor/github.com/markbates/pkger/pkger.go | 2 +- .../github.com/markbates/pkger/pkging/file.go | 2 +- .../markbates/pkger/pkging/pkger.go | 2 +- .../markbates/pkger/pkging/stdos/file.go | 2 +- .../markbates/pkger/pkging/stdos/stdos.go | 2 +- .../github.com/markbates/pkger/pkging/wrap.go | 2 +- .../mattn/go-colorable/colorable_windows.go | 28 +- vendor/github.com/valyala/fasttemplate/go.mod | 2 + .../valyala/fasttemplate/template.go | 132 +- .../github.com/valyala/fasttemplate/unsafe.go | 13 +- vendor/golang.org/x/crypto/md4/md4.go | 122 - vendor/golang.org/x/crypto/md4/md4block.go | 89 - vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go | 77 - vendor/golang.org/x/net/html/parse.go | 15 +- vendor/golang.org/x/net/http2/transport.go | 25 +- .../idna/{tables12.00.go => tables12.0.0.go} | 2 +- vendor/golang.org/x/net/idna/tables13.0.0.go | 4839 ++++++++++ .../x/sys/unix/syscall_darwin.1_13.go | 1 - .../x/sys/unix/syscall_dragonfly.go | 13 + vendor/golang.org/x/sys/unix/syscall_linux.go | 87 +- .../x/sys/unix/zsyscall_darwin_386.1_13.go | 2 - .../x/sys/unix/zsyscall_darwin_386.go | 142 - .../x/sys/unix/zsyscall_darwin_amd64.1_13.go | 2 - .../x/sys/unix/zsyscall_darwin_amd64.go | 142 - .../x/sys/unix/zsyscall_darwin_arm.1_13.go | 2 - .../x/sys/unix/zsyscall_darwin_arm.go | 141 - .../x/sys/unix/zsyscall_darwin_arm64.1_13.go | 2 - .../x/sys/unix/zsyscall_darwin_arm64.go | 142 - .../x/sys/unix/zsyscall_dragonfly_amd64.go | 10 + .../x/sys/unix/ztypes_darwin_386.go | 1 + .../x/sys/unix/ztypes_darwin_amd64.go | 1 + .../x/sys/unix/ztypes_darwin_arm.go | 1 + .../x/sys/unix/ztypes_darwin_arm64.go | 1 + .../golang.org/x/sys/windows/dll_windows.go | 1 - .../x/sys/windows/security_windows.go | 11 + vendor/golang.org/x/sys/windows/service.go | 6 + .../x/sys/windows/syscall_windows.go | 4 +- .../golang.org/x/sys/windows/types_windows.go | 19 + .../x/sys/windows/zsyscall_windows.go | 63 +- vendor/golang.org/x/term/go.mod | 2 +- vendor/golang.org/x/term/go.sum | 4 +- .../text/internal/language/compact/tables.go | 36 +- .../x/text/internal/language/tables.go | 4085 ++++----- vendor/golang.org/x/text/language/tables.go | 78 +- .../x/text/unicode/bidi/tables12.0.0.go | 2 +- .../x/text/unicode/bidi/tables13.0.0.go | 1955 +++++ .../x/text/unicode/norm/tables12.0.0.go | 2 +- .../x/text/unicode/norm/tables13.0.0.go | 7760 +++++++++++++++++ vendor/gopkg.in/ini.v1/.travis.yml | 20 - vendor/gopkg.in/ini.v1/Makefile | 2 +- vendor/gopkg.in/ini.v1/README.md | 8 +- vendor/gopkg.in/ini.v1/codecov.yml | 9 + vendor/gopkg.in/ini.v1/data_source.go | 2 + vendor/gopkg.in/ini.v1/file.go | 173 +- vendor/gopkg.in/ini.v1/ini.go | 24 +- vendor/gopkg.in/ini.v1/key.go | 120 +- vendor/gopkg.in/ini.v1/parser.go | 25 +- vendor/gopkg.in/ini.v1/section.go | 14 +- vendor/gopkg.in/ini.v1/struct.go | 238 +- vendor/modules.txt | 138 +- vendor/xorm.io/xorm/.drone.yml | 33 + vendor/xorm.io/xorm/CHANGELOG.md | 41 + vendor/xorm.io/xorm/Makefile | 7 + vendor/xorm.io/xorm/README.md | 8 +- vendor/xorm.io/xorm/README_CN.md | 4 +- vendor/xorm.io/xorm/core/tx.go | 33 +- vendor/xorm.io/xorm/dialects/mssql.go | 67 +- vendor/xorm.io/xorm/dialects/mysql.go | 21 +- vendor/xorm.io/xorm/dialects/postgres.go | 8 +- vendor/xorm.io/xorm/dialects/sqlite3.go | 2 +- vendor/xorm.io/xorm/engine.go | 143 +- vendor/xorm.io/xorm/go.mod | 10 +- vendor/xorm.io/xorm/go.sum | 139 +- vendor/xorm.io/xorm/interface.go | 1 + .../xorm/internal/statements/update.go | 2 +- .../xorm/internal/statements/values.go | 25 +- vendor/xorm.io/xorm/internal/utils/strings.go | 1 - vendor/xorm.io/xorm/log/logger_context.go | 1 + vendor/xorm.io/xorm/schemas/quote.go | 8 +- vendor/xorm.io/xorm/session.go | 10 +- vendor/xorm.io/xorm/session_tx.go | 45 +- vendor/xorm.io/xorm/session_update.go | 6 +- 290 files changed, 20869 insertions(+), 22829 deletions(-) delete mode 100644 vendor/github.com/alexbrainman/sspi/LICENSE delete mode 100644 vendor/github.com/alexbrainman/sspi/README.md delete mode 100644 vendor/github.com/alexbrainman/sspi/buffer.go delete mode 100644 vendor/github.com/alexbrainman/sspi/mksyscall.go delete mode 100644 vendor/github.com/alexbrainman/sspi/negotiate/negotiate.go delete mode 100644 vendor/github.com/alexbrainman/sspi/sspi.go delete mode 100644 vendor/github.com/alexbrainman/sspi/syscall.go delete mode 100644 vendor/github.com/alexbrainman/sspi/zsyscall_windows.go create mode 100644 vendor/github.com/antchfx/htmlquery/cache.go create mode 100644 vendor/github.com/antchfx/htmlquery/go.mod create mode 100644 vendor/github.com/antchfx/htmlquery/go.sum create mode 100644 vendor/github.com/antchfx/xpath/cache.go create mode 100644 vendor/github.com/antchfx/xpath/go.mod create mode 100644 vendor/github.com/golang/groupcache/LICENSE create mode 100644 vendor/github.com/golang/groupcache/lru/lru.go create mode 100644 vendor/github.com/golang/snappy/decode_arm64.s rename vendor/github.com/golang/snappy/{decode_amd64.go => decode_asm.go} (93%) create mode 100644 vendor/github.com/golang/snappy/encode_arm64.s rename vendor/github.com/golang/snappy/{encode_amd64.go => encode_asm.go} (97%) create mode 100644 vendor/github.com/golang/snappy/go.mod delete mode 100644 vendor/github.com/hashicorp/go-uuid/.travis.yml delete mode 100644 vendor/github.com/hashicorp/go-uuid/LICENSE delete mode 100644 vendor/github.com/hashicorp/go-uuid/README.md delete mode 100644 vendor/github.com/hashicorp/go-uuid/go.mod delete mode 100644 vendor/github.com/hashicorp/go-uuid/uuid.go delete mode 100644 vendor/github.com/jcmturner/aescts/v2/LICENSE delete mode 100644 vendor/github.com/jcmturner/aescts/v2/aescts.go delete mode 100644 vendor/github.com/jcmturner/aescts/v2/go.mod delete mode 100644 vendor/github.com/jcmturner/aescts/v2/go.sum delete mode 100644 vendor/github.com/jcmturner/dnsutils/v2/LICENSE delete mode 100644 vendor/github.com/jcmturner/dnsutils/v2/go.mod delete mode 100644 vendor/github.com/jcmturner/dnsutils/v2/go.sum delete mode 100644 vendor/github.com/jcmturner/dnsutils/v2/srv.go delete mode 100644 vendor/github.com/jcmturner/gofork/LICENSE delete mode 100644 vendor/github.com/jcmturner/gofork/encoding/asn1/README.md delete mode 100644 vendor/github.com/jcmturner/gofork/encoding/asn1/asn1.go delete mode 100644 vendor/github.com/jcmturner/gofork/encoding/asn1/common.go delete mode 100644 vendor/github.com/jcmturner/gofork/encoding/asn1/marshal.go delete mode 100644 vendor/github.com/jcmturner/gofork/x/crypto/pbkdf2/pbkdf2.go delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/LICENSE delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/README.md delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/authenticator.go delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/go.mod delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/go.sum delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/identity.go delete mode 100644 vendor/github.com/jcmturner/goidentity/v6/user.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/LICENSE delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/asn1tools/tools.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/ASExchange.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/TGSExchange.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/cache.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/client.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/network.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/passwd.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/session.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/client/settings.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/config/error.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/config/hosts.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/config/krb5conf.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/credentials/ccache.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/credentials/credentials.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha1-96.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha256-128.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha1-96.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha384-192.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/common/common.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/crypto.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/des3-cbc-sha1-kd.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/etype/etype.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rc4-hmac.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/encryption.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/keyDerivation.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/nfold.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/encryption.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/keyDerivation.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/checksum.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/encryption.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/keyDerivation.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/msgtype.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/encryption.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/keyDerivation.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/gssapi/MICToken.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/gssapi/README.md delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/gssapi/contextFlags.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/gssapi/gssapi.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/gssapi/wrapToken.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/addrtype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/adtype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/asnAppTag/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/chksumtype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/errorcode/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/etypeID/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/flags/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/keyusage/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/msgtype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/nametype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/iana/patype/constants.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/kadmin/changepasswddata.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/kadmin/message.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/kadmin/passwd.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/keytab/keytab.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/krberror/error.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/APRep.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/APReq.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KDCRep.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KDCReq.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KRBCred.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KRBError.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KRBPriv.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/KRBSafe.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/messages/Ticket.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/client_claims.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/client_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/credentials_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/device_claims.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/device_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/kerb_validation_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/pac_type.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/s4u_delegation_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/signature_data.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/supplemental_cred.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/pac/upn_dns_info.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/service/APExchange.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/service/authenticator.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/service/cache.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/service/settings.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/spnego/http.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/spnego/krb5Token.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/spnego/negotiationToken.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/spnego/spnego.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/Authenticator.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/AuthorizationData.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/Cryptosystem.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/HostAddress.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/KerberosFlags.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/PAData.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/PrincipalName.go delete mode 100644 vendor/github.com/jcmturner/gokrb5/v8/types/TypedData.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/LICENSE delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/claims.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/common.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/filetime.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/group_membership.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/kerb_sid_and_attributes.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/reader.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/rpc_unicode_string.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/sid.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/mstypes/user_session_key.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/arrays.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/decoder.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/error.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/header.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/pipe.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/primitives.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/rawbytes.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/strings.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/tags.go delete mode 100644 vendor/github.com/jcmturner/rpc/v2/ndr/union.go delete mode 100644 vendor/github.com/lib/pq/krb_unix.go delete mode 100644 vendor/github.com/lib/pq/krb_windows.go create mode 100644 vendor/github.com/markbates/pkger/here/here.go delete mode 100644 vendor/golang.org/x/crypto/md4/md4.go delete mode 100644 vendor/golang.org/x/crypto/md4/md4block.go delete mode 100644 vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go rename vendor/golang.org/x/net/idna/{tables12.00.go => tables12.0.0.go} (99%) create mode 100644 vendor/golang.org/x/net/idna/tables13.0.0.go create mode 100644 vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go create mode 100644 vendor/golang.org/x/text/unicode/norm/tables13.0.0.go delete mode 100644 vendor/gopkg.in/ini.v1/.travis.yml create mode 100644 vendor/gopkg.in/ini.v1/codecov.yml diff --git a/go.mod b/go.mod index f9a119e..1da38ac 100644 --- a/go.mod +++ b/go.mod @@ -3,27 +3,51 @@ module git.paulbsd.com/paulbsd/qrz go 1.15 require ( - github.com/antchfx/htmlquery v1.0.0 - github.com/antchfx/xpath v1.0.0 // indirect + github.com/alexbrainman/sspi v0.0.0-20200928142253-2a432fede40d // indirect + github.com/antchfx/htmlquery v1.2.3 + github.com/antchfx/xpath v1.1.11 // indirect + github.com/apache/thrift v0.12.0 // indirect + github.com/gobuffalo/here v0.6.2 // indirect github.com/gobuffalo/packr/v2 v2.8.1 - github.com/golang/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/golang/snappy v0.0.2 // indirect + github.com/google/go-cmp v0.5.4 // indirect + github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect github.com/karrick/godirwalk v1.16.1 // indirect - github.com/labstack/echo/v4 v4.1.16 - github.com/lib/pq v1.6.0 - github.com/markbates/pkger v0.14.0 - github.com/mattn/go-sqlite3 v2.0.1+incompatible // indirect + github.com/kr/text v0.2.0 // indirect + github.com/labstack/echo/v4 v4.1.17 + github.com/lib/pq v1.9.0 + github.com/markbates/pkger v0.17.1 + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect + github.com/nxadm/tail v1.4.5 // indirect + github.com/onsi/ginkgo v1.14.2 // indirect + github.com/onsi/gomega v1.10.3 // indirect + github.com/openzipkin/zipkin-go v0.1.6 // indirect github.com/robfig/cron v1.2.0 github.com/rogpeppe/go-internal v1.6.2 // indirect github.com/sirupsen/logrus v1.7.0 // indirect + github.com/smartystreets/assertions v1.2.0 // indirect github.com/smartystreets/goconvey v1.6.4 // indirect github.com/spf13/cobra v1.1.1 // indirect - golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect - golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect + golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c // indirect + golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect - golang.org/x/sys v0.0.0-20201118182958-a01c418693c7 // indirect + golang.org/x/sys v0.0.0-20201204225414-ed752295db88 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/text v0.3.4 // indirect golang.org/x/tools v0.0.0-20201118215654-4d9c4f8a78b0 // indirect - google.golang.org/appengine v1.6.2 // indirect - gopkg.in/ini.v1 v1.51.0 - gopkg.in/yaml.v2 v2.2.8 // indirect - xorm.io/xorm v1.0.2 + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/ini.v1 v1.62.0 + gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect + gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect + gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect + gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect + gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect + xorm.io/xorm v1.0.5 ) diff --git a/go.sum b/go.sum index 7371e9e..15b20a1 100644 --- a/go.sum +++ b/go.sum @@ -17,16 +17,24 @@ gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0p github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 h1:P5U+E4x5OkVEKQDklVPmzs71WM56RTTRqV4OrDC//Y4= github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro= +github.com/alexbrainman/sspi v0.0.0-20200928142253-2a432fede40d/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/antchfx/htmlquery v1.0.0 h1:O5IXz8fZF3B3MW+B33MZWbTHBlYmcfw0BAxgErHuaMA= github.com/antchfx/htmlquery v1.0.0/go.mod h1:MS9yksVSQXls00iXkiMqXr0J+umL/AmxXKuP28SUJM8= +github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M= +github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0= github.com/antchfx/xpath v1.0.0 h1:Q5gFgh2O40VTSwMOVbFE7nFNRBu3tS21Tn0KAWeEjtk= github.com/antchfx/xpath v1.0.0/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= +github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= +github.com/antchfx/xpath v1.1.11 h1:WOFtK8TVAjLm3lbgqeP0arlHpvCEeTANeWZ/csPpJkQ= +github.com/antchfx/xpath v1.1.11/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= @@ -36,6 +44,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -46,19 +55,25 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= +github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -66,9 +81,13 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI= github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= +github.com/gobuffalo/here v0.6.2 h1:ZtCqC7F9ou3moLbYfHM1Tj+gwHGgWhjyRjVjsir9BE0= +github.com/gobuffalo/here v0.6.2/go.mod h1:D75Sq0p2BVHdgQu3vCRsXbg85rx943V19urJpqAVWjI= github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc= github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM= github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM= @@ -79,8 +98,11 @@ github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -89,12 +111,29 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= +github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -103,12 +142,15 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -150,8 +192,10 @@ github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJA github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.2.0 h1:lzPl/30ZLkTveYsYZPKMcgXc8MbnE6RsTd4F9KgiLtk= github.com/jcmturner/gokrb5/v8 v8.2.0/go.mod h1:T1hnNppQsBtxW0tCHMHTkAt8n/sABdzZgZdoFrZaZNM= +github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= github.com/jcmturner/rpc/v2 v2.0.2 h1:gMB4IwRXYsWw4Bc6o/az2HJgFUA1ffSh90i26ZJ6Xl0= github.com/jcmturner/rpc/v2 v2.0.2/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -169,17 +213,27 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/labstack/echo/v4 v4.1.16 h1:8swiwjE5Jkai3RPfZoahp8kjVCRNq+y7Q0hPji2Kz0o= github.com/labstack/echo/v4 v4.1.16/go.mod h1:awO+5TzAjvL8XpibdsfXxPgHr+orhtXZJZIQCVjogKI= +github.com/labstack/echo/v4 v4.1.17 h1:PQIBaRplyRy3OjwILGkPg89JRtH2x5bssi59G2EL3fo= +github.com/labstack/echo/v4 v4.1.17/go.mod h1:Tn2yRQL/UclUalpb5rPdXDevbkJ+lp/2svdyFBg6CHQ= github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.6.0 h1:I5DPxhYJChW9KYc66se+oKFFQX6VuQrKiprsX6ivRZc= github.com/lib/pq v1.6.0/go.mod h1:4vXEAYvW1fRQ2/FhZ78H73A60MHw1geSm145z2mdY1g= +github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= +github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= @@ -188,20 +242,28 @@ github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= github.com/markbates/pkger v0.14.0 h1:z6KCEBkr3zJTkAMz5SJzjA9Izo+Ipb6XXvOIjQEW+PU= github.com/markbates/pkger v0.14.0/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= +github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= +github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -215,12 +277,23 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.5 h1:obHEce3upls1IBn1gTw/o7bCv7OJb6Ib/o7wNO+4eKw= +github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= +github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -236,6 +309,7 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -263,6 +337,8 @@ github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -288,6 +364,8 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= @@ -298,6 +376,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4= github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -323,8 +403,12 @@ golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA= golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o= golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c h1:9HhBz5L/UjnK9XLtiZhYAdue5BVKep3PMmS2LuPDt8k= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -345,6 +429,7 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -363,10 +448,18 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -397,21 +490,34 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201118182958-a01c418693c7 h1:Z991aAXPjz0tLnj74pVXW3eWJ5lHMIBvbRfMq4M2jHA= golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88 h1:KmZPnMocC93w341XZp26yTJg8Za7lhb2KhkYmixoeso= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -425,6 +531,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -440,6 +547,7 @@ golang.org/x/tools v0.0.0-20201118215654-4d9c4f8a78b0/go.mod h1:emZCQorbCU4vsT4f golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -454,6 +562,7 @@ google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.2 h1:j8RI1yW0SkI+paT6uGwMlrMI/6zwYA6/CFil8rxOzGI= google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -464,21 +573,40 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= @@ -496,13 +624,23 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI= xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/xorm v1.0.2 h1:kZlCh9rqd1AzGwWitcrEEqHE1h1eaZE/ujU5/2tWEtg= xorm.io/xorm v1.0.2/go.mod h1:o4vnEsQ5V2F1/WK6w4XTwmiWJeGj82tqjAnHe44wVHY= +xorm.io/xorm v1.0.5 h1:LRr5PfOUb4ODPR63YwbowkNDwcolT2LnkwP/TUaMaB0= +xorm.io/xorm v1.0.5/go.mod h1:uF9EtbhODq5kNWxMbnBEj8hRRZnlcNSz2t2N7HW/+A4= diff --git a/vendor/github.com/alexbrainman/sspi/LICENSE b/vendor/github.com/alexbrainman/sspi/LICENSE deleted file mode 100644 index 7448756..0000000 --- a/vendor/github.com/alexbrainman/sspi/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2012 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/alexbrainman/sspi/README.md b/vendor/github.com/alexbrainman/sspi/README.md deleted file mode 100644 index 848b6b5..0000000 --- a/vendor/github.com/alexbrainman/sspi/README.md +++ /dev/null @@ -1 +0,0 @@ -This repository holds Go packages for accessing Security Support Provider Interface on Windows. diff --git a/vendor/github.com/alexbrainman/sspi/buffer.go b/vendor/github.com/alexbrainman/sspi/buffer.go deleted file mode 100644 index f4b0ef3..0000000 --- a/vendor/github.com/alexbrainman/sspi/buffer.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build windows - -package sspi - -import ( - "io" - "unsafe" -) - -func (b *SecBuffer) Set(buftype uint32, data []byte) { - b.BufferType = buftype - if len(data) > 0 { - b.Buffer = &data[0] - b.BufferSize = uint32(len(data)) - } else { - b.Buffer = nil - b.BufferSize = 0 - } -} - -func (b *SecBuffer) Free() error { - if b.Buffer == nil { - return nil - } - return FreeContextBuffer((*byte)(unsafe.Pointer(b.Buffer))) -} - -func (b *SecBuffer) Bytes() []byte { - if b.Buffer == nil || b.BufferSize <= 0 { - return nil - } - return (*[2 << 20]byte)(unsafe.Pointer(b.Buffer))[:b.BufferSize] -} - -func (b *SecBuffer) WriteAll(w io.Writer) (int, error) { - if b.BufferSize == 0 || b.Buffer == nil { - return 0, nil - } - data := b.Bytes() - total := 0 - for { - n, err := w.Write(data) - total += n - if err != nil { - return total, err - } - if n >= len(data) { - break - } - data = data[n:] - } - return total, nil -} diff --git a/vendor/github.com/alexbrainman/sspi/mksyscall.go b/vendor/github.com/alexbrainman/sspi/mksyscall.go deleted file mode 100644 index 19e1195..0000000 --- a/vendor/github.com/alexbrainman/sspi/mksyscall.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package sspi - -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -systemdll=false -output=zsyscall_windows.go syscall.go diff --git a/vendor/github.com/alexbrainman/sspi/negotiate/negotiate.go b/vendor/github.com/alexbrainman/sspi/negotiate/negotiate.go deleted file mode 100644 index e041260..0000000 --- a/vendor/github.com/alexbrainman/sspi/negotiate/negotiate.go +++ /dev/null @@ -1,462 +0,0 @@ -// Copyright 2016 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build windows - -// Package negotiate provides access to the Microsoft Negotiate SSP Package. -// -package negotiate - -import ( - "errors" - "syscall" - "time" - "unsafe" - - "github.com/alexbrainman/sspi" -) - -// TODO: maybe (if possible) move all winapi related out of sspi and into sspi/internal/winapi - -// PackageInfo contains Negotiate SSP package description. -var PackageInfo *sspi.PackageInfo - -func init() { - var err error - PackageInfo, err = sspi.QueryPackageInfo(sspi.NEGOSSP_NAME) - if err != nil { - panic("failed to fetch Negotiate package info: " + err.Error()) - } -} - -func acquireCredentials(principalName string, creduse uint32, ai *sspi.SEC_WINNT_AUTH_IDENTITY) (*sspi.Credentials, error) { - c, err := sspi.AcquireCredentials(principalName, sspi.NEGOSSP_NAME, creduse, (*byte)(unsafe.Pointer(ai))) - if err != nil { - return nil, err - } - return c, nil -} - -// AcquireCurrentUserCredentials acquires credentials of currently -// logged on user. These will be used by the client to authenticate -// itself to the server. It will also be used by the server -// to impersonate the user. -func AcquireCurrentUserCredentials() (*sspi.Credentials, error) { - return acquireCredentials("", sspi.SECPKG_CRED_OUTBOUND, nil) -} - -// TODO: see if I can share this common ntlm and negotiate code - -// AcquireUserCredentials acquires credentials of user described by -// domain, username and password. These will be used by the client to -// authenticate itself to the server. It will also be used by the -// server to impersonate the user. -func AcquireUserCredentials(domain, username, password string) (*sspi.Credentials, error) { - if len(username) == 0 { - return nil, errors.New("username parameter cannot be empty") - } - d, err := syscall.UTF16FromString(domain) - if err != nil { - return nil, err - } - u, err := syscall.UTF16FromString(username) - if err != nil { - return nil, err - } - p, err := syscall.UTF16FromString(password) - if err != nil { - return nil, err - } - ai := sspi.SEC_WINNT_AUTH_IDENTITY{ - User: &u[0], - UserLength: uint32(len(u) - 1), // do not count terminating 0 - Domain: &d[0], - DomainLength: uint32(len(d) - 1), // do not count terminating 0 - Password: &p[0], - PasswordLength: uint32(len(p) - 1), // do not count terminating 0 - Flags: sspi.SEC_WINNT_AUTH_IDENTITY_UNICODE, - } - return acquireCredentials("", sspi.SECPKG_CRED_OUTBOUND, &ai) -} - -// AcquireServerCredentials acquires server credentials that will -// be used to authenticate clients. -// The principalName parameter is passed to the underlying call to -// the winapi AcquireCredentialsHandle function (and specifies the -// name of the principal whose credentials the underlying handle -// will reference). -// As a special case, using an empty string for the principal name -// will require the credential of the user under whose security context -// the current process is running. -func AcquireServerCredentials(principalName string) (*sspi.Credentials, error) { - return acquireCredentials(principalName, sspi.SECPKG_CRED_INBOUND, nil) -} - -func updateContext(c *sspi.Context, dst, src []byte, targetName *uint16) (authCompleted bool, n int, err error) { - var inBuf, outBuf [1]sspi.SecBuffer - inBuf[0].Set(sspi.SECBUFFER_TOKEN, src) - inBufs := &sspi.SecBufferDesc{ - Version: sspi.SECBUFFER_VERSION, - BuffersCount: 1, - Buffers: &inBuf[0], - } - outBuf[0].Set(sspi.SECBUFFER_TOKEN, dst) - outBufs := &sspi.SecBufferDesc{ - Version: sspi.SECBUFFER_VERSION, - BuffersCount: 1, - Buffers: &outBuf[0], - } - ret := c.Update(targetName, outBufs, inBufs) - switch ret { - case sspi.SEC_E_OK: - // session established -> return success - return true, int(outBuf[0].BufferSize), nil - case sspi.SEC_I_COMPLETE_NEEDED, sspi.SEC_I_COMPLETE_AND_CONTINUE: - ret = sspi.CompleteAuthToken(c.Handle, outBufs) - if ret != sspi.SEC_E_OK { - return false, 0, ret - } - case sspi.SEC_I_CONTINUE_NEEDED: - default: - return false, 0, ret - } - return false, int(outBuf[0].BufferSize), nil -} - -func makeSignature(c *sspi.Context, msg []byte, qop, seqno uint32) ([]byte, error) { - _, maxSignature, _, _, err := c.Sizes() - if err != nil { - return nil, err - } - - if maxSignature == 0 { - return nil, errors.New("integrity services are not requested or unavailable") - } - - var b [2]sspi.SecBuffer - b[0].Set(sspi.SECBUFFER_DATA, msg) - b[1].Set(sspi.SECBUFFER_TOKEN, make([]byte, maxSignature)) - - ret := sspi.MakeSignature(c.Handle, qop, sspi.NewSecBufferDesc(b[:]), seqno) - if ret != sspi.SEC_E_OK { - return nil, ret - } - - return b[1].Bytes(), nil -} - -func encryptMessage(c *sspi.Context, msg []byte, qop, seqno uint32) ([]byte, error) { - _ /*maxToken*/, maxSignature, cBlockSize, cSecurityTrailer, err := c.Sizes() - if err != nil { - return nil, err - } - - if maxSignature == 0 { - return nil, errors.New("integrity services are not requested or unavailable") - } - - var b [3]sspi.SecBuffer - b[0].Set(sspi.SECBUFFER_TOKEN, make([]byte, cSecurityTrailer)) - b[1].Set(sspi.SECBUFFER_DATA, msg) - b[2].Set(sspi.SECBUFFER_PADDING, make([]byte, cBlockSize)) - - ret := sspi.EncryptMessage(c.Handle, qop, sspi.NewSecBufferDesc(b[:]), seqno) - if ret != sspi.SEC_E_OK { - return nil, ret - } - - r0, r1, r2 := b[0].Bytes(), b[1].Bytes(), b[2].Bytes() - res := make([]byte, 0, len(r0)+len(r1)+len(r2)) - res = append(res, r0...) - res = append(res, r1...) - res = append(res, r2...) - - return res, nil -} - -func decryptMessage(c *sspi.Context, msg []byte, seqno uint32) (uint32, []byte, error) { - var b [2]sspi.SecBuffer - b[0].Set(sspi.SECBUFFER_STREAM, msg) - b[1].Set(sspi.SECBUFFER_DATA, []byte{}) - - var qop uint32 - ret := sspi.DecryptMessage(c.Handle, sspi.NewSecBufferDesc(b[:]), seqno, &qop) - if ret != sspi.SEC_E_OK { - return qop, nil, ret - } - - return qop, b[1].Bytes(), nil -} - -func verifySignature(c *sspi.Context, msg, token []byte, seqno uint32) (uint32, error) { - var b [2]sspi.SecBuffer - b[0].Set(sspi.SECBUFFER_DATA, msg) - b[1].Set(sspi.SECBUFFER_TOKEN, token) - - var qop uint32 - - ret := sspi.VerifySignature(c.Handle, sspi.NewSecBufferDesc(b[:]), seqno, &qop) - if ret != sspi.SEC_E_OK { - return 0, ret - } - - return qop, nil -} - -// ClientContext is used by the client to manage all steps of Negotiate negotiation. -type ClientContext struct { - sctxt *sspi.Context - targetName *uint16 -} - -// NewClientContext creates a new client context. It uses client -// credentials cred generated by AcquireCurrentUserCredentials or -// AcquireUserCredentials and SPN to start a client Negotiate -// negotiation sequence. targetName is the service principal name -// (SPN) or the security context of the destination server. -// NewClientContext returns a new token to be sent to the server. -func NewClientContext(cred *sspi.Credentials, targetName string) (cc *ClientContext, outputToken []byte, err error) { - return NewClientContextWithFlags(cred, targetName, sspi.ISC_REQ_CONNECTION) -} - -// NewClientContextWithFlags creates a new client context. It uses client -// credentials cred generated by AcquireCurrentUserCredentials or -// AcquireUserCredentials and SPN to start a client Negotiate -// negotiation sequence. targetName is the service principal name -// (SPN) or the security context of the destination server. -// The flags parameter is used to indicate requests for the context -// (for example sspi.ISC_REQ_CONFIDENTIALITY|sspi.ISC_REQ_REPLAY_DETECT) -// NewClientContextWithFlags returns a new token to be sent to the server. -func NewClientContextWithFlags(cred *sspi.Credentials, targetName string, flags uint32) (cc *ClientContext, outputToken []byte, err error) { - var tname *uint16 - if len(targetName) > 0 { - p, err2 := syscall.UTF16FromString(targetName) - if err2 != nil { - return nil, nil, err2 - } - if len(p) > 0 { - tname = &p[0] - } - } - otoken := make([]byte, PackageInfo.MaxToken) - c := sspi.NewClientContext(cred, flags) - - authCompleted, n, err2 := updateContext(c, otoken, nil, tname) - if err2 != nil { - return nil, nil, err2 - } - if authCompleted { - c.Release() - return nil, nil, errors.New("negotiate authentication should not be completed yet") - } - if n == 0 { - c.Release() - return nil, nil, errors.New("negotiate token should not be empty") - } - otoken = otoken[:n] - return &ClientContext{sctxt: c, targetName: tname}, otoken, nil -} - -// Release free up resources associated with client context c. -func (c *ClientContext) Release() error { - if c == nil { - return nil - } - return c.sctxt.Release() -} - -// Expiry returns c expiry time. -func (c *ClientContext) Expiry() time.Time { - return c.sctxt.Expiry() -} - -// Update advances client part of Negotiate negotiation c. It uses -// token received from the server and returns true if client part -// of authentication is complete. It also returns new token to be -// sent to the server. -func (c *ClientContext) Update(token []byte) (authCompleted bool, outputToken []byte, err error) { - otoken := make([]byte, PackageInfo.MaxToken) - authDone, n, err2 := updateContext(c.sctxt, otoken, token, c.targetName) - if err2 != nil { - return false, nil, err2 - } - if n == 0 && !authDone { - return false, nil, errors.New("negotiate token should not be empty") - } - otoken = otoken[:n] - return authDone, otoken, nil -} - -// Sizes queries the client context for the sizes used in per-message -// functions. It returns the maximum token size used in authentication -// exchanges, the maximum signature size, the preferred integral size of -// messages, the size of any security trailer, and any error. -func (c *ClientContext) Sizes() (uint32, uint32, uint32, uint32, error) { - return c.sctxt.Sizes() -} - -// MakeSignature uses the established client context to create a signature -// for the given message using the provided quality of protection flags and -// sequence number. It returns the signature token in addition to any error. -func (c *ClientContext) MakeSignature(msg []byte, qop, seqno uint32) ([]byte, error) { - return makeSignature(c.sctxt, msg, qop, seqno) -} - -// VerifySignature uses the established client context and signature token -// to check that the provided message hasn't been tampered or received out -// of sequence. It returns any quality of protection flags and any error -// that occurred. -func (c *ClientContext) VerifySignature(msg, token []byte, seqno uint32) (uint32, error) { - return verifySignature(c.sctxt, msg, token, seqno) -} - -// EncryptMessage uses the established client context to encrypt a message -// using the provided quality of protection flags and sequence number. -// It returns the signature token in addition to any error. -// IMPORTANT: the input msg parameter is updated in place by the low-level windows api -// so must be copied if the initial content should not be modified. -func (c *ClientContext) EncryptMessage(msg []byte, qop, seqno uint32) ([]byte, error) { - return encryptMessage(c.sctxt, msg, qop, seqno) -} - -// DecryptMessage uses the established client context to decrypt a message -// using the provided sequence number. -// It returns the quality of protection flag and the decrypted message in addition to any error. -func (c *ClientContext) DecryptMessage(msg []byte, seqno uint32) (uint32, []byte, error) { - return decryptMessage(c.sctxt, msg, seqno) -} - -// VerifyFlags determines if all flags used to construct the client context -// were honored (see NewClientContextWithFlags). It should be called after c.Update. -func (c *ClientContext) VerifyFlags() error { - return c.sctxt.VerifyFlags() -} - -// VerifySelectiveFlags determines if the given flags were honored (see NewClientContextWithFlags). -// It should be called after c.Update. -func (c *ClientContext) VerifySelectiveFlags(flags uint32) error { - return c.sctxt.VerifySelectiveFlags(flags) -} - -// ServerContext is used by the server to manage all steps of Negotiate -// negotiation. Once authentication is completed the context can be -// used to impersonate client. -type ServerContext struct { - sctxt *sspi.Context -} - -// NewServerContext creates new server context. It uses server -// credentials created by AcquireServerCredentials and token from -// the client to start server Negotiate negotiation sequence. -// It also returns new token to be sent to the client. -func NewServerContext(cred *sspi.Credentials, token []byte) (sc *ServerContext, authDone bool, outputToken []byte, err error) { - otoken := make([]byte, PackageInfo.MaxToken) - c := sspi.NewServerContext(cred, sspi.ASC_REQ_CONNECTION) - authDone, n, err2 := updateContext(c, otoken, token, nil) - if err2 != nil { - return nil, false, nil, err2 - } - otoken = otoken[:n] - return &ServerContext{sctxt: c}, authDone, otoken, nil -} - -// Release free up resources associated with server context c. -func (c *ServerContext) Release() error { - if c == nil { - return nil - } - return c.sctxt.Release() -} - -// Expiry returns c expiry time. -func (c *ServerContext) Expiry() time.Time { - return c.sctxt.Expiry() -} - -// Update advances server part of Negotiate negotiation c. It uses -// token received from the client and returns true if server part -// of authentication is complete. It also returns new token to be -// sent to the client. -func (c *ServerContext) Update(token []byte) (authCompleted bool, outputToken []byte, err error) { - otoken := make([]byte, PackageInfo.MaxToken) - authDone, n, err2 := updateContext(c.sctxt, otoken, token, nil) - if err2 != nil { - return false, nil, err2 - } - if n == 0 && !authDone { - return false, nil, errors.New("negotiate token should not be empty") - } - otoken = otoken[:n] - return authDone, otoken, nil -} - -const _SECPKG_ATTR_NATIVE_NAMES = 13 - -type _SecPkgContext_NativeNames struct { - ClientName *uint16 - ServerName *uint16 -} - -// GetUsername returns the username corresponding to the authenticated client -func (c *ServerContext) GetUsername() (string, error) { - var ns _SecPkgContext_NativeNames - ret := sspi.QueryContextAttributes(c.sctxt.Handle, _SECPKG_ATTR_NATIVE_NAMES, (*byte)(unsafe.Pointer(&ns))) - if ret != sspi.SEC_E_OK { - return "", ret - } - sspi.FreeContextBuffer((*byte)(unsafe.Pointer(ns.ServerName))) - defer sspi.FreeContextBuffer((*byte)(unsafe.Pointer(ns.ClientName))) - return syscall.UTF16ToString((*[2 << 20]uint16)(unsafe.Pointer(ns.ClientName))[:]), nil -} - -// ImpersonateUser changes current OS thread user. New user is -// the user as specified by client credentials. -func (c *ServerContext) ImpersonateUser() error { - return c.sctxt.ImpersonateUser() -} - -// RevertToSelf stops impersonation. It changes current OS thread -// user to what it was before ImpersonateUser was executed. -func (c *ServerContext) RevertToSelf() error { - return c.sctxt.RevertToSelf() -} - -// Sizes queries the server context for the sizes used in per-message -// functions. It returns the maximum token size used in authentication -// exchanges, the maximum signature size, the preferred integral size of -// messages, the size of any security trailer, and any error. -func (c *ServerContext) Sizes() (uint32, uint32, uint32, uint32, error) { - return c.sctxt.Sizes() -} - -// MakeSignature uses the established server context to create a signature -// for the given message using the provided quality of protection flags and -// sequence number. It returns the signature token in addition to any error. -func (c *ServerContext) MakeSignature(msg []byte, qop, seqno uint32) ([]byte, error) { - return makeSignature(c.sctxt, msg, qop, seqno) -} - -// VerifySignature uses the established server context and signature token -// to check that the provided message hasn't been tampered or received out -// of sequence. It returns any quality of protection flags and any error -// that occurred. -func (c *ServerContext) VerifySignature(msg, token []byte, seqno uint32) (uint32, error) { - return verifySignature(c.sctxt, msg, token, seqno) -} - -// EncryptMessage uses the established server context to encrypt a message -// using the provided quality of protection flags and sequence number. -// It returns the signature token in addition to any error. -// IMPORTANT: the input msg parameter is updated in place by the low-level windows api -// so must be copied if the initial content should not be modified. -func (c *ServerContext) EncryptMessage(msg []byte, qop, seqno uint32) ([]byte, error) { - return encryptMessage(c.sctxt, msg, qop, seqno) -} - -// DecryptMessage uses the established server context to decrypt a message -// using the provided sequence number. -// It returns the quality of protection flag and the decrypted message in addition to any error. -func (c *ServerContext) DecryptMessage(msg []byte, seqno uint32) (uint32, []byte, error) { - return decryptMessage(c.sctxt, msg, seqno) -} diff --git a/vendor/github.com/alexbrainman/sspi/sspi.go b/vendor/github.com/alexbrainman/sspi/sspi.go deleted file mode 100644 index 04f20b7..0000000 --- a/vendor/github.com/alexbrainman/sspi/sspi.go +++ /dev/null @@ -1,226 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build windows - -package sspi - -import ( - "fmt" - "syscall" - "time" - "unsafe" -) - -// TODO: add documentation - -type PackageInfo struct { - Capabilities uint32 - Version uint16 - RPCID uint16 - MaxToken uint32 - Name string - Comment string -} - -func QueryPackageInfo(pkgname string) (*PackageInfo, error) { - name, err := syscall.UTF16PtrFromString(pkgname) - if err != nil { - return nil, err - } - var pi *SecPkgInfo - ret := QuerySecurityPackageInfo(name, &pi) - if ret != SEC_E_OK { - return nil, ret - } - defer FreeContextBuffer((*byte)(unsafe.Pointer(pi))) - - return &PackageInfo{ - Capabilities: pi.Capabilities, - Version: pi.Version, - RPCID: pi.RPCID, - MaxToken: pi.MaxToken, - Name: syscall.UTF16ToString((*[2 << 12]uint16)(unsafe.Pointer(pi.Name))[:]), - Comment: syscall.UTF16ToString((*[2 << 12]uint16)(unsafe.Pointer(pi.Comment))[:]), - }, nil -} - -type Credentials struct { - Handle CredHandle - expiry syscall.Filetime -} - -// AcquireCredentials calls the windows AcquireCredentialsHandle function and -// returns Credentials containing a security handle that can be used for -// InitializeSecurityContext or AcceptSecurityContext operations. -// As a special case, passing an empty string as the principal parameter will -// pass a null string to the underlying function. -func AcquireCredentials(principal string, pkgname string, creduse uint32, authdata *byte) (*Credentials, error) { - var principalName *uint16 - if principal != "" { - var err error - principalName, err = syscall.UTF16PtrFromString(principal) - if err != nil { - return nil, err - } - } - name, err := syscall.UTF16PtrFromString(pkgname) - if err != nil { - return nil, err - } - var c Credentials - ret := AcquireCredentialsHandle(principalName, name, creduse, nil, authdata, 0, 0, &c.Handle, &c.expiry) - if ret != SEC_E_OK { - return nil, ret - } - return &c, nil -} - -func (c *Credentials) Release() error { - if c == nil { - return nil - } - ret := FreeCredentialsHandle(&c.Handle) - if ret != SEC_E_OK { - return ret - } - return nil -} - -func (c *Credentials) Expiry() time.Time { - return time.Unix(0, c.expiry.Nanoseconds()) -} - -// TODO: add functions to display and manage RequestedFlags and EstablishedFlags fields. -// TODO: maybe get rid of RequestedFlags and EstablishedFlags fields, and replace them with input parameter for New...Context and return value of Update (instead of current bool parameter). - -type updateFunc func(c *Context, targname *uint16, h, newh *CtxtHandle, out, in *SecBufferDesc) syscall.Errno - -type Context struct { - Cred *Credentials - Handle *CtxtHandle - handle CtxtHandle - updFn updateFunc - expiry syscall.Filetime - RequestedFlags uint32 - EstablishedFlags uint32 -} - -func NewClientContext(cred *Credentials, flags uint32) *Context { - return &Context{ - Cred: cred, - updFn: initialize, - RequestedFlags: flags, - } -} - -func NewServerContext(cred *Credentials, flags uint32) *Context { - return &Context{ - Cred: cred, - updFn: accept, - RequestedFlags: flags, - } -} - -func initialize(c *Context, targname *uint16, h, newh *CtxtHandle, out, in *SecBufferDesc) syscall.Errno { - return InitializeSecurityContext(&c.Cred.Handle, h, targname, c.RequestedFlags, - 0, SECURITY_NATIVE_DREP, in, 0, newh, out, &c.EstablishedFlags, &c.expiry) -} - -func accept(c *Context, targname *uint16, h, newh *CtxtHandle, out, in *SecBufferDesc) syscall.Errno { - return AcceptSecurityContext(&c.Cred.Handle, h, in, c.RequestedFlags, - SECURITY_NATIVE_DREP, newh, out, &c.EstablishedFlags, &c.expiry) -} - -func (c *Context) Update(targname *uint16, out, in *SecBufferDesc) syscall.Errno { - h := c.Handle - if c.Handle == nil { - c.Handle = &c.handle - } - return c.updFn(c, targname, h, c.Handle, out, in) -} - -func (c *Context) Release() error { - if c == nil { - return nil - } - ret := DeleteSecurityContext(c.Handle) - if ret != SEC_E_OK { - return ret - } - return nil -} - -func (c *Context) Expiry() time.Time { - return time.Unix(0, c.expiry.Nanoseconds()) -} - -// TODO: add comment to function doco that this "impersonation" is applied to current OS thread. -func (c *Context) ImpersonateUser() error { - ret := ImpersonateSecurityContext(c.Handle) - if ret != SEC_E_OK { - return ret - } - return nil -} - -func (c *Context) RevertToSelf() error { - ret := RevertSecurityContext(c.Handle) - if ret != SEC_E_OK { - return ret - } - return nil -} - -// Sizes queries the context for the sizes used in per-message functions. -// It returns the maximum token size used in authentication exchanges, the -// maximum signature size, the preferred integral size of messages, the -// size of any security trailer, and any error. -func (c *Context) Sizes() (uint32, uint32, uint32, uint32, error) { - var s _SecPkgContext_Sizes - ret := QueryContextAttributes(c.Handle, _SECPKG_ATTR_SIZES, (*byte)(unsafe.Pointer(&s))) - if ret != SEC_E_OK { - return 0, 0, 0, 0, ret - } - return s.MaxToken, s.MaxSignature, s.BlockSize, s.SecurityTrailer, nil -} - -// VerifyFlags determines if all flags used to construct the context -// were honored (see NewClientContext). It should be called after c.Update. -func (c *Context) VerifyFlags() error { - return c.VerifySelectiveFlags(c.RequestedFlags) -} - -// VerifySelectiveFlags determines if the given flags were honored (see NewClientContext). -// It should be called after c.Update. -func (c *Context) VerifySelectiveFlags(flags uint32) error { - if valid, missing, extra := verifySelectiveFlags(flags, c.RequestedFlags); !valid { - return fmt.Errorf("sspi: invalid flags check: desired=%b requested=%b missing=%b extra=%b", flags, c.RequestedFlags, missing, extra) - } - if valid, missing, extra := verifySelectiveFlags(flags, c.EstablishedFlags); !valid { - return fmt.Errorf("sspi: invalid flags: desired=%b established=%b missing=%b extra=%b", flags, c.EstablishedFlags, missing, extra) - } - return nil -} - -// verifySelectiveFlags determines if all bits requested in flags are set in establishedFlags. -// missing represents the bits set in flags that are not set in establishedFlags. -// extra represents the bits set in establishedFlags that are not set in flags. -// valid is true and missing is zero when establishedFlags has all of the requested flags. -func verifySelectiveFlags(flags, establishedFlags uint32) (valid bool, missing, extra uint32) { - missing = flags&establishedFlags ^ flags - extra = flags | establishedFlags ^ flags - valid = missing == 0 - return valid, missing, extra -} - -// NewSecBufferDesc returns an initialized SecBufferDesc describing the -// provided SecBuffer. -func NewSecBufferDesc(b []SecBuffer) *SecBufferDesc { - return &SecBufferDesc{ - Version: SECBUFFER_VERSION, - BuffersCount: uint32(len(b)), - Buffers: &b[0], - } -} diff --git a/vendor/github.com/alexbrainman/sspi/syscall.go b/vendor/github.com/alexbrainman/sspi/syscall.go deleted file mode 100644 index 04660df..0000000 --- a/vendor/github.com/alexbrainman/sspi/syscall.go +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build windows - -package sspi - -import ( - "syscall" -) - -const ( - SEC_E_OK = syscall.Errno(0) - - SEC_I_COMPLETE_AND_CONTINUE = syscall.Errno(590612) - SEC_I_COMPLETE_NEEDED = syscall.Errno(590611) - SEC_I_CONTINUE_NEEDED = syscall.Errno(590610) - - SEC_E_LOGON_DENIED = syscall.Errno(0x8009030c) - SEC_E_CONTEXT_EXPIRED = syscall.Errno(0x80090317) // not sure if the value is valid - SEC_E_INCOMPLETE_MESSAGE = syscall.Errno(0x80090318) - - NTLMSP_NAME = "NTLM" - MICROSOFT_KERBEROS_NAME = "Kerberos" - NEGOSSP_NAME = "Negotiate" - UNISP_NAME = "Microsoft Unified Security Protocol Provider" - - _SECPKG_ATTR_SIZES = 0 - _SECPKG_ATTR_NAMES = 1 - _SECPKG_ATTR_LIFESPAN = 2 - _SECPKG_ATTR_DCE_INFO = 3 - _SECPKG_ATTR_STREAM_SIZES = 4 - _SECPKG_ATTR_KEY_INFO = 5 - _SECPKG_ATTR_AUTHORITY = 6 - _SECPKG_ATTR_PROTO_INFO = 7 - _SECPKG_ATTR_PASSWORD_EXPIRY = 8 - _SECPKG_ATTR_SESSION_KEY = 9 - _SECPKG_ATTR_PACKAGE_INFO = 10 - _SECPKG_ATTR_USER_FLAGS = 11 - _SECPKG_ATTR_NEGOTIATION_INFO = 12 - _SECPKG_ATTR_NATIVE_NAMES = 13 - _SECPKG_ATTR_FLAGS = 14 -) - -type SecPkgInfo struct { - Capabilities uint32 - Version uint16 - RPCID uint16 - MaxToken uint32 - Name *uint16 - Comment *uint16 -} - -type _SecPkgContext_Sizes struct { - MaxToken uint32 - MaxSignature uint32 - BlockSize uint32 - SecurityTrailer uint32 -} - -//sys QuerySecurityPackageInfo(pkgname *uint16, pkginfo **SecPkgInfo) (ret syscall.Errno) = secur32.QuerySecurityPackageInfoW -//sys FreeContextBuffer(buf *byte) (ret syscall.Errno) = secur32.FreeContextBuffer - -const ( - SECPKG_CRED_INBOUND = 1 - SECPKG_CRED_OUTBOUND = 2 - SECPKG_CRED_BOTH = (SECPKG_CRED_OUTBOUND | SECPKG_CRED_INBOUND) - - SEC_WINNT_AUTH_IDENTITY_UNICODE = 0x2 -) - -type SEC_WINNT_AUTH_IDENTITY struct { - User *uint16 - UserLength uint32 - Domain *uint16 - DomainLength uint32 - Password *uint16 - PasswordLength uint32 - Flags uint32 -} - -type LUID struct { - LowPart uint32 - HighPart int32 -} - -type CredHandle struct { - Lower uintptr - Upper uintptr -} - -//sys AcquireCredentialsHandle(principal *uint16, pkgname *uint16, creduse uint32, logonid *LUID, authdata *byte, getkeyfn uintptr, getkeyarg uintptr, handle *CredHandle, expiry *syscall.Filetime) (ret syscall.Errno) = secur32.AcquireCredentialsHandleW -//sys FreeCredentialsHandle(handle *CredHandle) (ret syscall.Errno) = secur32.FreeCredentialsHandle - -const ( - SECURITY_NATIVE_DREP = 16 - - SECBUFFER_DATA = 1 - SECBUFFER_TOKEN = 2 - SECBUFFER_PKG_PARAMS = 3 - SECBUFFER_MISSING = 4 - SECBUFFER_EXTRA = 5 - SECBUFFER_STREAM_TRAILER = 6 - SECBUFFER_STREAM_HEADER = 7 - SECBUFFER_PADDING = 9 - SECBUFFER_STREAM = 10 - SECBUFFER_READONLY = 0x80000000 - SECBUFFER_ATTRMASK = 0xf0000000 - SECBUFFER_VERSION = 0 - SECBUFFER_EMPTY = 0 - - ISC_REQ_DELEGATE = 1 - ISC_REQ_MUTUAL_AUTH = 2 - ISC_REQ_REPLAY_DETECT = 4 - ISC_REQ_SEQUENCE_DETECT = 8 - ISC_REQ_CONFIDENTIALITY = 16 - ISC_REQ_USE_SESSION_KEY = 32 - ISC_REQ_PROMPT_FOR_CREDS = 64 - ISC_REQ_USE_SUPPLIED_CREDS = 128 - ISC_REQ_ALLOCATE_MEMORY = 256 - ISC_REQ_USE_DCE_STYLE = 512 - ISC_REQ_DATAGRAM = 1024 - ISC_REQ_CONNECTION = 2048 - ISC_REQ_EXTENDED_ERROR = 16384 - ISC_REQ_STREAM = 32768 - ISC_REQ_INTEGRITY = 65536 - ISC_REQ_MANUAL_CRED_VALIDATION = 524288 - ISC_REQ_HTTP = 268435456 - - ASC_REQ_DELEGATE = 1 - ASC_REQ_MUTUAL_AUTH = 2 - ASC_REQ_REPLAY_DETECT = 4 - ASC_REQ_SEQUENCE_DETECT = 8 - ASC_REQ_CONFIDENTIALITY = 16 - ASC_REQ_USE_SESSION_KEY = 32 - ASC_REQ_ALLOCATE_MEMORY = 256 - ASC_REQ_USE_DCE_STYLE = 512 - ASC_REQ_DATAGRAM = 1024 - ASC_REQ_CONNECTION = 2048 - ASC_REQ_EXTENDED_ERROR = 32768 - ASC_REQ_STREAM = 65536 - ASC_REQ_INTEGRITY = 131072 -) - -type CtxtHandle struct { - Lower uintptr - Upper uintptr -} - -type SecBuffer struct { - BufferSize uint32 - BufferType uint32 - Buffer *byte -} - -type SecBufferDesc struct { - Version uint32 - BuffersCount uint32 - Buffers *SecBuffer -} - -//sys InitializeSecurityContext(credential *CredHandle, context *CtxtHandle, targname *uint16, contextreq uint32, reserved1 uint32, targdatarep uint32, input *SecBufferDesc, reserved2 uint32, newcontext *CtxtHandle, output *SecBufferDesc, contextattr *uint32, expiry *syscall.Filetime) (ret syscall.Errno) = secur32.InitializeSecurityContextW -//sys AcceptSecurityContext(credential *CredHandle, context *CtxtHandle, input *SecBufferDesc, contextreq uint32, targdatarep uint32, newcontext *CtxtHandle, output *SecBufferDesc, contextattr *uint32, expiry *syscall.Filetime) (ret syscall.Errno) = secur32.AcceptSecurityContext -//sys CompleteAuthToken(context *CtxtHandle, token *SecBufferDesc) (ret syscall.Errno) = secur32.CompleteAuthToken -//sys DeleteSecurityContext(context *CtxtHandle) (ret syscall.Errno) = secur32.DeleteSecurityContext -//sys ImpersonateSecurityContext(context *CtxtHandle) (ret syscall.Errno) = secur32.ImpersonateSecurityContext -//sys RevertSecurityContext(context *CtxtHandle) (ret syscall.Errno) = secur32.RevertSecurityContext -//sys QueryContextAttributes(context *CtxtHandle, attribute uint32, buf *byte) (ret syscall.Errno) = secur32.QueryContextAttributesW -//sys EncryptMessage(context *CtxtHandle, qop uint32, message *SecBufferDesc, messageseqno uint32) (ret syscall.Errno) = secur32.EncryptMessage -//sys DecryptMessage(context *CtxtHandle, message *SecBufferDesc, messageseqno uint32, qop *uint32) (ret syscall.Errno) = secur32.DecryptMessage -//sys ApplyControlToken(context *CtxtHandle, input *SecBufferDesc) (ret syscall.Errno) = secur32.ApplyControlToken -//sys MakeSignature(context *CtxtHandle, qop uint32, message *SecBufferDesc, messageseqno uint32) (ret syscall.Errno) = secur32.MakeSignature -//sys VerifySignature(context *CtxtHandle, message *SecBufferDesc, messageseqno uint32, qop *uint32) (ret syscall.Errno) = secur32.VerifySignature diff --git a/vendor/github.com/alexbrainman/sspi/zsyscall_windows.go b/vendor/github.com/alexbrainman/sspi/zsyscall_windows.go deleted file mode 100644 index 55e8209..0000000 --- a/vendor/github.com/alexbrainman/sspi/zsyscall_windows.go +++ /dev/null @@ -1,152 +0,0 @@ -// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT - -package sspi - -import ( - "syscall" - "unsafe" -) - -var _ unsafe.Pointer - -// Do the interface allocations only once for common -// Errno values. -const ( - errnoERROR_IO_PENDING = 997 -) - -var ( - errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) -) - -// errnoErr returns common boxed Errno values, to prevent -// allocations at runtime. -func errnoErr(e syscall.Errno) error { - switch e { - case 0: - return nil - case errnoERROR_IO_PENDING: - return errERROR_IO_PENDING - } - // TODO: add more here, after collecting data on the common - // error values see on Windows. (perhaps when running - // all.bat?) - return e -} - -var ( - modsecur32 = syscall.NewLazyDLL("secur32.dll") - - procQuerySecurityPackageInfoW = modsecur32.NewProc("QuerySecurityPackageInfoW") - procFreeContextBuffer = modsecur32.NewProc("FreeContextBuffer") - procAcquireCredentialsHandleW = modsecur32.NewProc("AcquireCredentialsHandleW") - procFreeCredentialsHandle = modsecur32.NewProc("FreeCredentialsHandle") - procInitializeSecurityContextW = modsecur32.NewProc("InitializeSecurityContextW") - procAcceptSecurityContext = modsecur32.NewProc("AcceptSecurityContext") - procCompleteAuthToken = modsecur32.NewProc("CompleteAuthToken") - procDeleteSecurityContext = modsecur32.NewProc("DeleteSecurityContext") - procImpersonateSecurityContext = modsecur32.NewProc("ImpersonateSecurityContext") - procRevertSecurityContext = modsecur32.NewProc("RevertSecurityContext") - procQueryContextAttributesW = modsecur32.NewProc("QueryContextAttributesW") - procEncryptMessage = modsecur32.NewProc("EncryptMessage") - procDecryptMessage = modsecur32.NewProc("DecryptMessage") - procApplyControlToken = modsecur32.NewProc("ApplyControlToken") - procMakeSignature = modsecur32.NewProc("MakeSignature") - procVerifySignature = modsecur32.NewProc("VerifySignature") -) - -func QuerySecurityPackageInfo(pkgname *uint16, pkginfo **SecPkgInfo) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procQuerySecurityPackageInfoW.Addr(), 2, uintptr(unsafe.Pointer(pkgname)), uintptr(unsafe.Pointer(pkginfo)), 0) - ret = syscall.Errno(r0) - return -} - -func FreeContextBuffer(buf *byte) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procFreeContextBuffer.Addr(), 1, uintptr(unsafe.Pointer(buf)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func AcquireCredentialsHandle(principal *uint16, pkgname *uint16, creduse uint32, logonid *LUID, authdata *byte, getkeyfn uintptr, getkeyarg uintptr, handle *CredHandle, expiry *syscall.Filetime) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall9(procAcquireCredentialsHandleW.Addr(), 9, uintptr(unsafe.Pointer(principal)), uintptr(unsafe.Pointer(pkgname)), uintptr(creduse), uintptr(unsafe.Pointer(logonid)), uintptr(unsafe.Pointer(authdata)), uintptr(getkeyfn), uintptr(getkeyarg), uintptr(unsafe.Pointer(handle)), uintptr(unsafe.Pointer(expiry))) - ret = syscall.Errno(r0) - return -} - -func FreeCredentialsHandle(handle *CredHandle) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procFreeCredentialsHandle.Addr(), 1, uintptr(unsafe.Pointer(handle)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func InitializeSecurityContext(credential *CredHandle, context *CtxtHandle, targname *uint16, contextreq uint32, reserved1 uint32, targdatarep uint32, input *SecBufferDesc, reserved2 uint32, newcontext *CtxtHandle, output *SecBufferDesc, contextattr *uint32, expiry *syscall.Filetime) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall12(procInitializeSecurityContextW.Addr(), 12, uintptr(unsafe.Pointer(credential)), uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(targname)), uintptr(contextreq), uintptr(reserved1), uintptr(targdatarep), uintptr(unsafe.Pointer(input)), uintptr(reserved2), uintptr(unsafe.Pointer(newcontext)), uintptr(unsafe.Pointer(output)), uintptr(unsafe.Pointer(contextattr)), uintptr(unsafe.Pointer(expiry))) - ret = syscall.Errno(r0) - return -} - -func AcceptSecurityContext(credential *CredHandle, context *CtxtHandle, input *SecBufferDesc, contextreq uint32, targdatarep uint32, newcontext *CtxtHandle, output *SecBufferDesc, contextattr *uint32, expiry *syscall.Filetime) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall9(procAcceptSecurityContext.Addr(), 9, uintptr(unsafe.Pointer(credential)), uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(input)), uintptr(contextreq), uintptr(targdatarep), uintptr(unsafe.Pointer(newcontext)), uintptr(unsafe.Pointer(output)), uintptr(unsafe.Pointer(contextattr)), uintptr(unsafe.Pointer(expiry))) - ret = syscall.Errno(r0) - return -} - -func CompleteAuthToken(context *CtxtHandle, token *SecBufferDesc) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procCompleteAuthToken.Addr(), 2, uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(token)), 0) - ret = syscall.Errno(r0) - return -} - -func DeleteSecurityContext(context *CtxtHandle) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procDeleteSecurityContext.Addr(), 1, uintptr(unsafe.Pointer(context)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func ImpersonateSecurityContext(context *CtxtHandle) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procImpersonateSecurityContext.Addr(), 1, uintptr(unsafe.Pointer(context)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func RevertSecurityContext(context *CtxtHandle) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procRevertSecurityContext.Addr(), 1, uintptr(unsafe.Pointer(context)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func QueryContextAttributes(context *CtxtHandle, attribute uint32, buf *byte) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procQueryContextAttributesW.Addr(), 3, uintptr(unsafe.Pointer(context)), uintptr(attribute), uintptr(unsafe.Pointer(buf))) - ret = syscall.Errno(r0) - return -} - -func EncryptMessage(context *CtxtHandle, qop uint32, message *SecBufferDesc, messageseqno uint32) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall6(procEncryptMessage.Addr(), 4, uintptr(unsafe.Pointer(context)), uintptr(qop), uintptr(unsafe.Pointer(message)), uintptr(messageseqno), 0, 0) - ret = syscall.Errno(r0) - return -} - -func DecryptMessage(context *CtxtHandle, message *SecBufferDesc, messageseqno uint32, qop *uint32) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall6(procDecryptMessage.Addr(), 4, uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(message)), uintptr(messageseqno), uintptr(unsafe.Pointer(qop)), 0, 0) - ret = syscall.Errno(r0) - return -} - -func ApplyControlToken(context *CtxtHandle, input *SecBufferDesc) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall(procApplyControlToken.Addr(), 2, uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(input)), 0) - ret = syscall.Errno(r0) - return -} - -func MakeSignature(context *CtxtHandle, qop uint32, message *SecBufferDesc, messageseqno uint32) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall6(procMakeSignature.Addr(), 4, uintptr(unsafe.Pointer(context)), uintptr(qop), uintptr(unsafe.Pointer(message)), uintptr(messageseqno), 0, 0) - ret = syscall.Errno(r0) - return -} - -func VerifySignature(context *CtxtHandle, message *SecBufferDesc, messageseqno uint32, qop *uint32) (ret syscall.Errno) { - r0, _, _ := syscall.Syscall6(procVerifySignature.Addr(), 4, uintptr(unsafe.Pointer(context)), uintptr(unsafe.Pointer(message)), uintptr(messageseqno), uintptr(unsafe.Pointer(qop)), 0, 0) - ret = syscall.Errno(r0) - return -} diff --git a/vendor/github.com/antchfx/htmlquery/.travis.yml b/vendor/github.com/antchfx/htmlquery/.travis.yml index 1f72256..86da84a 100644 --- a/vendor/github.com/antchfx/htmlquery/.travis.yml +++ b/vendor/github.com/antchfx/htmlquery/.travis.yml @@ -1,15 +1,16 @@ language: go go: - - 1.6 - - 1.7 - - 1.8 + - 1.9.x + - 1.12.x + - 1.13.x install: - go get golang.org/x/net/html/charset - go get golang.org/x/net/html - go get github.com/antchfx/xpath - go get github.com/mattn/goveralls + - go get github.com/golang/groupcache script: - $HOME/gopath/bin/goveralls -service=travis-ci \ No newline at end of file diff --git a/vendor/github.com/antchfx/htmlquery/README.md b/vendor/github.com/antchfx/htmlquery/README.md index 0f466cb..6e7775d 100644 --- a/vendor/github.com/antchfx/htmlquery/README.md +++ b/vendor/github.com/antchfx/htmlquery/README.md @@ -8,31 +8,42 @@ htmlquery Overview ==== -htmlquery is an XPath query package for HTML, lets you extract data or evaluate from HTML documents by an XPath expression. +`htmlquery` is an XPath query package for HTML, lets you extract data or evaluate from HTML documents by an XPath expression. -Changelogs -=== - -2019-02-04 -- [#7](https://github.com/antchfx/htmlquery/issues/7) Removed deprecated `FindEach()` and `FindEachWithBreak()` methods. - -2018-12-28 -- Avoid adding duplicate elements to list for `Find()` method. [#6](https://github.com/antchfx/htmlquery/issues/6) +`htmlquery` built-in the query object caching feature based on [LRU](https://godoc.org/github.com/golang/groupcache/lru), this feature will caching the recently used XPATH query string. Enable query caching can avoid re-compile XPath expression each query. Installation ==== -> $ go get github.com/antchfx/htmlquery +``` +go get github.com/antchfx/htmlquery +``` Getting Started ==== +#### Query, returns matched elements or error. + +```go +nodes, err := htmlquery.QueryAll(doc, "//a") +if err != nil { + panic(`not a valid XPath expression.`) +} +``` + #### Load HTML document from URL. ```go doc, err := htmlquery.LoadURL("http://example.com/") ``` +#### Load HTML from document. + +```go +filePath := "/home/user/sample.html" +doc, err := htmlquery.LoadDoc(filePath) +``` + #### Load HTML document from string. ```go @@ -52,10 +63,13 @@ list := htmlquery.Find(doc, "//a") list := range htmlquery.Find(doc, "//a[@href]") ``` -#### Find all A elements and only get `href` attribute self. +#### Find all A elements with `href` attribute and only return `href` value. ```go list := range htmlquery.Find(doc, "//a/@href") +for n := range list{ + fmt.Println(htmlquery.InnerText(n)) // output @href value without A element. +} ``` ### Find the third A element. @@ -72,7 +86,55 @@ v := expr.Evaluate(htmlquery.CreateXPathNavigator(doc)).(float64) fmt.Printf("total count is %f", v) ``` -Quick Tutorial + +FAQ +==== + +#### `Find()` vs `QueryAll()`, which is better? + +`Find` and `QueryAll` both do the same things, searches all of matched html nodes. +The `Find` will panics if you give an error XPath query, but `QueryAll` will return an error for you. + +#### Can I save my query expression object for the next query? + +Yes, you can. We offer the `QuerySelector` and `QuerySelectorAll` methods, It will accept your query expression object. + +Cache a query expression object(or reused) will avoid re-compile XPath query expression, improve your query performance. + +#### XPath query object cache performance + +``` +goos: windows +goarch: amd64 +pkg: github.com/antchfx/htmlquery +BenchmarkSelectorCache-4 20000000 55.2 ns/op +BenchmarkDisableSelectorCache-4 500000 3162 ns/op +``` + +#### How to disable caching? + +``` +htmlquery.DisableSelectorCache = true +``` + +Changelogs +=== + +2019-11-19 +- Add built-in query object cache feature, avoid re-compilation for the same query string. [#16](https://github.com/antchfx/htmlquery/issues/16) +- Added LoadDoc [18](https://github.com/antchfx/htmlquery/pull/18) + +2019-10-05 +- Add new methods that compatible with invalid XPath expression error: `QueryAll` and `Query`. +- Add `QuerySelector` and `QuerySelectorAll` methods, supported reused your query object. + +2019-02-04 +- [#7](https://github.com/antchfx/htmlquery/issues/7) Removed deprecated `FindEach()` and `FindEachWithBreak()` methods. + +2018-12-28 +- Avoid adding duplicate elements to list for `Find()` method. [#6](https://github.com/antchfx/htmlquery/issues/6) + +Tutorial === ```go @@ -82,7 +144,11 @@ func main() { panic(err) } // Find all news item. - for i, n := range htmlquery.Find(doc, "//ol/li") { + list, err := htmlquery.QueryAll(doc, "//ol/li") + if err != nil { + panic(err) + } + for i, n := range list { a := htmlquery.FindOne(n, "//a") fmt.Printf("%d %s(%s)\n", i, htmlquery.InnerText(a), htmlquery.SelectAttr(a, "href")) } @@ -91,11 +157,11 @@ func main() { List of supported XPath query packages === -|Name |Description | -|--------------------------|----------------| -|[htmlquery](https://github.com/antchfx/htmlquery) | XPath query package for the HTML document| -|[xmlquery](https://github.com/antchfx/xmlquery) | XPath query package for the XML document| -|[jsonquery](https://github.com/antchfx/jsonquery) | XPath query package for the JSON document| +| Name | Description | +| ------------------------------------------------- | ----------------------------------------- | +| [htmlquery](https://github.com/antchfx/htmlquery) | XPath query package for the HTML document | +| [xmlquery](https://github.com/antchfx/xmlquery) | XPath query package for the XML document | +| [jsonquery](https://github.com/antchfx/jsonquery) | XPath query package for the JSON document | Questions === diff --git a/vendor/github.com/antchfx/htmlquery/cache.go b/vendor/github.com/antchfx/htmlquery/cache.go new file mode 100644 index 0000000..e27cd28 --- /dev/null +++ b/vendor/github.com/antchfx/htmlquery/cache.go @@ -0,0 +1,42 @@ +package htmlquery + +import ( + "sync" + + "github.com/antchfx/xpath" + "github.com/golang/groupcache/lru" +) + +// DisableSelectorCache will disable caching for the query selector if value is true. +var DisableSelectorCache = false + +// SelectorCacheMaxEntries allows how many selector object can be caching. Default is 50. +// Will disable caching if SelectorCacheMaxEntries <= 0. +var SelectorCacheMaxEntries = 50 + +var ( + cacheOnce sync.Once + cache *lru.Cache + cacheMutex sync.Mutex +) + +func getQuery(expr string) (*xpath.Expr, error) { + if DisableSelectorCache || SelectorCacheMaxEntries <= 0 { + return xpath.Compile(expr) + } + cacheOnce.Do(func() { + cache = lru.New(SelectorCacheMaxEntries) + }) + cacheMutex.Lock() + defer cacheMutex.Unlock() + if v, ok := cache.Get(expr); ok { + return v.(*xpath.Expr), nil + } + v, err := xpath.Compile(expr) + if err != nil { + return nil, err + } + cache.Add(expr, v) + return v, nil + +} diff --git a/vendor/github.com/antchfx/htmlquery/go.mod b/vendor/github.com/antchfx/htmlquery/go.mod new file mode 100644 index 0000000..14169f5 --- /dev/null +++ b/vendor/github.com/antchfx/htmlquery/go.mod @@ -0,0 +1,9 @@ +module github.com/antchfx/htmlquery + +go 1.14 + +require ( + github.com/antchfx/xpath v1.1.6 + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e + golang.org/x/net v0.0.0-20200421231249-e086a090c8fd +) diff --git a/vendor/github.com/antchfx/htmlquery/go.sum b/vendor/github.com/antchfx/htmlquery/go.sum new file mode 100644 index 0000000..2d6e03e --- /dev/null +++ b/vendor/github.com/antchfx/htmlquery/go.sum @@ -0,0 +1,11 @@ +github.com/antchfx/xpath v1.1.6 h1:6sVh6hB5T6phw1pFpHRQ+C4bd8sNI+O58flqtg7h0R0= +github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/vendor/github.com/antchfx/htmlquery/query.go b/vendor/github.com/antchfx/htmlquery/query.go index 37d30b9..db75782 100644 --- a/vendor/github.com/antchfx/htmlquery/query.go +++ b/vendor/github.com/antchfx/htmlquery/query.go @@ -4,10 +4,12 @@ Package htmlquery provides extract data from HTML documents using XPath expressi package htmlquery import ( + "bufio" "bytes" "fmt" "io" "net/http" + "os" "github.com/antchfx/xpath" "golang.org/x/net/html" @@ -21,14 +23,63 @@ func CreateXPathNavigator(top *html.Node) *NodeNavigator { return &NodeNavigator{curr: top, root: top, attr: -1} } -// Find searches the html.Node that matches by the specified XPath expr. +// Find is like QueryAll but Will panics if the expression `expr` cannot be parsed. +// +// See `QueryAll()` function. func Find(top *html.Node, expr string) []*html.Node { - exp, err := xpath.Compile(expr) + nodes, err := QueryAll(top, expr) if err != nil { panic(err) } + return nodes +} + +// FindOne is like Query but will panics if the expression `expr` cannot be parsed. +// See `Query()` function. +func FindOne(top *html.Node, expr string) *html.Node { + node, err := Query(top, expr) + if err != nil { + panic(err) + } + return node +} + +// QueryAll searches the html.Node that matches by the specified XPath expr. +// Return an error if the expression `expr` cannot be parsed. +func QueryAll(top *html.Node, expr string) ([]*html.Node, error) { + exp, err := getQuery(expr) + if err != nil { + return nil, err + } + nodes := QuerySelectorAll(top, exp) + return nodes, nil +} + +// Query searches the html.Node that matches by the specified XPath expr, +// and return the first element of matched html.Node. +// +// Return an error if the expression `expr` cannot be parsed. +func Query(top *html.Node, expr string) (*html.Node, error) { + exp, err := getQuery(expr) + if err != nil { + return nil, err + } + return QuerySelector(top, exp), nil +} + +// QuerySelector returns the first matched html.Node by the specified XPath selector. +func QuerySelector(top *html.Node, selector *xpath.Expr) *html.Node { + t := selector.Select(CreateXPathNavigator(top)) + if t.MoveNext() { + return getCurrentNode(t.Current().(*NodeNavigator)) + } + return nil +} + +// QuerySelectorAll searches all of the html.Node that matches the specified XPath selectors. +func QuerySelectorAll(top *html.Node, selector *xpath.Expr) []*html.Node { var elems []*html.Node - t := exp.Select(CreateXPathNavigator(top)) + t := selector.Select(CreateXPathNavigator(top)) for t.MoveNext() { nav := t.Current().(*NodeNavigator) n := getCurrentNode(nav) @@ -42,21 +93,6 @@ func Find(top *html.Node, expr string) []*html.Node { return elems } -// FindOne searches the html.Node that matches by the specified XPath expr, -// and returns first element of matched html.Node. -func FindOne(top *html.Node, expr string) *html.Node { - var elem *html.Node - exp, err := xpath.Compile(expr) - if err != nil { - panic(err) - } - t := exp.Select(CreateXPathNavigator(top)) - if t.MoveNext() { - elem = getCurrentNode(t.Current().(*NodeNavigator)) - } - return elem -} - // LoadURL loads the HTML document from the specified URL. func LoadURL(url string) (*html.Node, error) { resp, err := http.Get(url) @@ -72,6 +108,17 @@ func LoadURL(url string) (*html.Node, error) { return html.Parse(r) } +// LoadDoc loads the HTML document from the specified file path. +func LoadDoc(path string) (*html.Node, error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + defer f.Close() + + return html.Parse(bufio.NewReader(f)) +} + func getCurrentNode(n *NodeNavigator) *html.Node { if n.NodeType() == xpath.AttributeNode { childNode := &html.Node{ diff --git a/vendor/github.com/antchfx/xpath/README.md b/vendor/github.com/antchfx/xpath/README.md index 414114d..9a58a9f 100644 --- a/vendor/github.com/antchfx/xpath/README.md +++ b/vendor/github.com/antchfx/xpath/README.md @@ -138,12 +138,15 @@ Supported Features `lang()`| ✗ | `last()`| ✓ | `local-name()`| ✓ | +`matches()`| ✓ | `name()`| ✓ | `namespace-uri()`| ✓ | `normalize-space()`| ✓ | `not()`| ✓ | `number()`| ✓ | `position()`| ✓ | +`replace()`| ✓ | +`reverse()`| ✓ | `round()`| ✓ | `starts-with()`| ✓ | `string()`| ✓ | @@ -160,6 +163,9 @@ Supported Features Changelogs === +2019-03-19 +- optimize XPath `|` operation performance. [#33](https://github.com/antchfx/xpath/issues/33). Tips: suggest split into multiple subquery if you have a lot of `|` operations. + 2019-01-29 - improvement `normalize-space` function. [#32](https://github.com/antchfx/xpath/issues/32) diff --git a/vendor/github.com/antchfx/xpath/build.go b/vendor/github.com/antchfx/xpath/build.go index 74f266b..2edafb8 100644 --- a/vendor/github.com/antchfx/xpath/build.go +++ b/vendor/github.com/antchfx/xpath/build.go @@ -77,7 +77,18 @@ func (b *builder) processAxisNode(root *axisNode) (query, error) { } else { qyGrandInput = &contextQuery{} } - qyOutput = &descendantQuery{Input: qyGrandInput, Predicate: predicate, Self: true} + // fix #20: https://github.com/antchfx/htmlquery/issues/20 + filter := func(n NodeNavigator) bool { + v := predicate(n) + switch root.Prop { + case "text": + v = v && n.NodeType() == TextNode + case "comment": + v = v && n.NodeType() == CommentNode + } + return v + } + qyOutput = &descendantQuery{Input: qyGrandInput, Predicate: filter, Self: true} return qyOutput, nil } } @@ -182,8 +193,23 @@ func (b *builder) processFunctionNode(root *functionNode) (query, error) { if err != nil { return nil, err } - qyOutput = &functionQuery{Input: b.firstInput, Func: containsFunc(arg1, arg2)} + case "matches": + //matches(string , pattern) + if len(root.Args) != 2 { + return nil, errors.New("xpath: matches function must have two parameters") + } + var ( + arg1, arg2 query + err error + ) + if arg1, err = b.processNode(root.Args[0]); err != nil { + return nil, err + } + if arg2, err = b.processNode(root.Args[1]); err != nil { + return nil, err + } + qyOutput = &functionQuery{Input: b.firstInput, Func: matchesFunc(arg1, arg2)} case "substring": //substring( string , start [, length] ) if len(root.Args) < 2 { @@ -243,6 +269,25 @@ func (b *builder) processFunctionNode(root *functionNode) (query, error) { return nil, err } qyOutput = &functionQuery{Input: argQuery, Func: normalizespaceFunc} + case "replace": + //replace( string , string, string ) + if len(root.Args) != 3 { + return nil, errors.New("xpath: replace function must have three parameters") + } + var ( + arg1, arg2, arg3 query + err error + ) + if arg1, err = b.processNode(root.Args[0]); err != nil { + return nil, err + } + if arg2, err = b.processNode(root.Args[1]); err != nil { + return nil, err + } + if arg3, err = b.processNode(root.Args[2]); err != nil { + return nil, err + } + qyOutput = &functionQuery{Input: b.firstInput, Func: replaceFunc(arg1, arg2, arg3)} case "translate": //translate( string , string, string ) if len(root.Args) != 3 { @@ -272,27 +317,27 @@ func (b *builder) processFunctionNode(root *functionNode) (query, error) { } qyOutput = &functionQuery{Input: argQuery, Func: notFunc} case "name", "local-name", "namespace-uri": - inp := b.firstInput if len(root.Args) > 1 { return nil, fmt.Errorf("xpath: %s function must have at most one parameter", root.FuncName) } + var ( + arg query + err error + ) if len(root.Args) == 1 { - argQuery, err := b.processNode(root.Args[0]) + arg, err = b.processNode(root.Args[0]) if err != nil { return nil, err } - inp = argQuery } - f := &functionQuery{Input: inp} switch root.FuncName { case "name": - f.Func = nameFunc + qyOutput = &functionQuery{Input: b.firstInput, Func: nameFunc(arg)} case "local-name": - f.Func = localNameFunc + qyOutput = &functionQuery{Input: b.firstInput, Func: localNameFunc(arg)} case "namespace-uri": - f.Func = namespaceFunc + qyOutput = &functionQuery{Input: b.firstInput, Func: namespaceFunc(arg)} } - qyOutput = f case "true", "false": val := root.FuncName == "true" qyOutput = &functionQuery{ @@ -379,6 +424,15 @@ func (b *builder) processFunctionNode(root *functionNode) (query, error) { args = append(args, q) } qyOutput = &functionQuery{Input: b.firstInput, Func: concatFunc(args...)} + case "reverse": + if len(root.Args) == 0 { + return nil, fmt.Errorf("xpath: reverse(node-sets) function must with have parameters node-sets") + } + argQuery, err := b.processNode(root.Args[0]) + if err != nil { + return nil, err + } + qyOutput = &transformFunctionQuery{Input: argQuery, Func: reverseFunc} default: return nil, fmt.Errorf("not yet support this function %s()", root.FuncName) } @@ -396,13 +450,15 @@ func (b *builder) processOperatorNode(root *operatorNode) (query, error) { } var qyOutput query switch root.Op { - case "+", "-", "div", "mod": // Numeric operator + case "+", "-", "*", "div", "mod": // Numeric operator var exprFunc func(interface{}, interface{}) interface{} switch root.Op { case "+": exprFunc = plusFunc case "-": exprFunc = minusFunc + case "*": + exprFunc = mulFunc case "div": exprFunc = divFunc case "mod": diff --git a/vendor/github.com/antchfx/xpath/cache.go b/vendor/github.com/antchfx/xpath/cache.go new file mode 100644 index 0000000..31a2b33 --- /dev/null +++ b/vendor/github.com/antchfx/xpath/cache.go @@ -0,0 +1,80 @@ +package xpath + +import ( + "regexp" + "sync" +) + +type loadFunc func(key interface{}) (interface{}, error) + +const ( + defaultCap = 65536 +) + +// The reason we're building a simple capacity-resetting loading cache (when capacity reached) instead of using +// something like github.com/hashicorp/golang-lru is primarily due to (not wanting to create) external dependency. +// Currently this library has 0 external dep (other than go sdk), and supports go 1.6, 1.9, and 1.10 (and later). +// Creating external lib dependencies (plus their transitive dependencies) would make things hard if not impossible. +// We expect under most circumstances, the defaultCap is big enough for any long running services that use this +// library if their xpath regexp cardinality is low. However, in extreme cases when the capacity is reached, we +// simply reset the cache, taking a small subsequent perf hit (next to nothing considering amortization) in trade +// of more complex and less performant LRU type of construct. +type loadingCache struct { + sync.RWMutex + cap int + load loadFunc + m map[interface{}]interface{} + reset int +} + +// NewLoadingCache creates a new instance of a loading cache with capacity. Capacity must be >= 0, or +// it will panic. Capacity == 0 means the cache growth is unbounded. +func NewLoadingCache(load loadFunc, capacity int) *loadingCache { + if capacity < 0 { + panic("capacity must be >= 0") + } + return &loadingCache{cap: capacity, load: load, m: make(map[interface{}]interface{})} +} + +func (c *loadingCache) get(key interface{}) (interface{}, error) { + c.RLock() + v, found := c.m[key] + c.RUnlock() + if found { + return v, nil + } + v, err := c.load(key) + if err != nil { + return nil, err + } + c.Lock() + if c.cap > 0 && len(c.m) >= c.cap { + c.m = map[interface{}]interface{}{key: v} + c.reset++ + } else { + c.m[key] = v + } + c.Unlock() + return v, nil +} + +var ( + // RegexpCache is a loading cache for string -> *regexp.Regexp mapping. It is exported so that in rare cases + // client can customize load func and/or capacity. + RegexpCache = defaultRegexpCache() +) + +func defaultRegexpCache() *loadingCache { + return NewLoadingCache( + func(key interface{}) (interface{}, error) { + return regexp.Compile(key.(string)) + }, defaultCap) +} + +func getRegexp(pattern string) (*regexp.Regexp, error) { + exp, err := RegexpCache.get(pattern) + if err != nil { + return nil, err + } + return exp.(*regexp.Regexp), nil +} diff --git a/vendor/github.com/antchfx/xpath/func.go b/vendor/github.com/antchfx/xpath/func.go index 3c0fde9..fd4187b 100644 --- a/vendor/github.com/antchfx/xpath/func.go +++ b/vendor/github.com/antchfx/xpath/func.go @@ -4,11 +4,26 @@ import ( "errors" "fmt" "math" - "regexp" "strconv" "strings" + "sync" + "unicode" ) +// Defined an interface of stringBuilder that compatible with +// strings.Builder(go 1.10) and bytes.Buffer(< go 1.10) +type stringBuilder interface { + WriteRune(r rune) (n int, err error) + WriteString(s string) (int, error) + Reset() + Grow(n int) + String() string +} + +var builderPool = sync.Pool{New: func() interface{} { + return newStringBuilder() +}} + // The XPath function list. func predicate(q query) func(NodeNavigator) bool { @@ -25,7 +40,7 @@ func predicate(q query) func(NodeNavigator) bool { func positionFunc(q query, t iterator) interface{} { var ( count = 1 - node = t.Current() + node = t.Current().Copy() ) test := predicate(q) for node.MoveToPrevious() { @@ -40,7 +55,7 @@ func positionFunc(q query, t iterator) interface{} { func lastFunc(q query, t iterator) interface{} { var ( count = 0 - node = t.Current() + node = t.Current().Copy() ) node.MoveToFirst() test := predicate(q) @@ -58,6 +73,7 @@ func lastFunc(q query, t iterator) interface{} { // countFunc is a XPath Node Set functions count(node-set). func countFunc(q query, t iterator) interface{} { var count = 0 + q = functionArgs(q) test := predicate(q) switch typ := q.Evaluate(t).(type) { case query: @@ -73,7 +89,7 @@ func countFunc(q query, t iterator) interface{} { // sumFunc is a XPath Node Set functions sum(node-set). func sumFunc(q query, t iterator) interface{} { var sum float64 - switch typ := q.Evaluate(t).(type) { + switch typ := functionArgs(q).Evaluate(t).(type) { case query: for node := typ.Select(t); node != nil; node = typ.Select(t) { if v, err := strconv.ParseFloat(node.Value(), 64); err == nil { @@ -116,52 +132,82 @@ func asNumber(t iterator, o interface{}) float64 { // ceilingFunc is a XPath Node Set functions ceiling(node-set). func ceilingFunc(q query, t iterator) interface{} { - val := asNumber(t, q.Evaluate(t)) + val := asNumber(t, functionArgs(q).Evaluate(t)) return math.Ceil(val) } // floorFunc is a XPath Node Set functions floor(node-set). func floorFunc(q query, t iterator) interface{} { - val := asNumber(t, q.Evaluate(t)) + val := asNumber(t, functionArgs(q).Evaluate(t)) return math.Floor(val) } // roundFunc is a XPath Node Set functions round(node-set). func roundFunc(q query, t iterator) interface{} { - val := asNumber(t, q.Evaluate(t)) + val := asNumber(t, functionArgs(q).Evaluate(t)) //return math.Round(val) return round(val) } // nameFunc is a XPath functions name([node-set]). -func nameFunc(q query, t iterator) interface{} { - v := q.Select(t) - if v == nil { - return "" +func nameFunc(arg query) func(query, iterator) interface{} { + return func(q query, t iterator) interface{} { + var v NodeNavigator + if arg == nil { + v = t.Current() + } else { + v = arg.Clone().Select(t) + if v == nil { + return "" + } + } + ns := v.Prefix() + if ns == "" { + return v.LocalName() + } + return ns + ":" + v.LocalName() } - ns := v.Prefix() - if ns == "" { - return v.LocalName() - } - return ns + ":" + v.LocalName() } // localNameFunc is a XPath functions local-name([node-set]). -func localNameFunc(q query, t iterator) interface{} { - v := q.Select(t) - if v == nil { - return "" +func localNameFunc(arg query) func(query, iterator) interface{} { + return func(q query, t iterator) interface{} { + var v NodeNavigator + if arg == nil { + v = t.Current() + } else { + v = arg.Clone().Select(t) + if v == nil { + return "" + } + } + return v.LocalName() } - return v.LocalName() } // namespaceFunc is a XPath functions namespace-uri([node-set]). -func namespaceFunc(q query, t iterator) interface{} { - v := q.Select(t) - if v == nil { - return "" +func namespaceFunc(arg query) func(query, iterator) interface{} { + return func(q query, t iterator) interface{} { + var v NodeNavigator + if arg == nil { + v = t.Current() + } else { + // Get the first node in the node-set if specified. + v = arg.Clone().Select(t) + if v == nil { + return "" + } + } + // fix about namespace-uri() bug: https://github.com/antchfx/xmlquery/issues/22 + // TODO: In the next version, add NamespaceURL() to the NodeNavigator interface. + type namespaceURL interface { + NamespaceURL() string + } + if f, ok := v.(namespaceURL); ok { + return f.NamespaceURL() + } + return v.Prefix() } - return v.Prefix() } func asBool(t iterator, v interface{}) bool { @@ -171,7 +217,7 @@ func asBool(t iterator, v interface{}) bool { case *NodeIterator: return v.MoveNext() case bool: - return bool(v) + return v case float64: return v != 0 case string: @@ -209,19 +255,19 @@ func asString(t iterator, v interface{}) string { // booleanFunc is a XPath functions boolean([node-set]). func booleanFunc(q query, t iterator) interface{} { - v := q.Evaluate(t) + v := functionArgs(q).Evaluate(t) return asBool(t, v) } // numberFunc is a XPath functions number([node-set]). func numberFunc(q query, t iterator) interface{} { - v := q.Evaluate(t) + v := functionArgs(q).Evaluate(t) return asNumber(t, v) } // stringFunc is a XPath functions string([node-set]). func stringFunc(q query, t iterator) interface{} { - v := q.Evaluate(t) + v := functionArgs(q).Evaluate(t) return asString(t, v) } @@ -232,7 +278,7 @@ func startwithFunc(arg1, arg2 query) func(query, iterator) interface{} { m, n string ok bool ) - switch typ := arg1.Evaluate(t).(type) { + switch typ := functionArgs(arg1).Evaluate(t).(type) { case string: m = typ case query: @@ -244,7 +290,7 @@ func startwithFunc(arg1, arg2 query) func(query, iterator) interface{} { default: panic(errors.New("starts-with() function argument type must be string")) } - n, ok = arg2.Evaluate(t).(string) + n, ok = functionArgs(arg2).Evaluate(t).(string) if !ok { panic(errors.New("starts-with() function argument type must be string")) } @@ -259,7 +305,7 @@ func endwithFunc(arg1, arg2 query) func(query, iterator) interface{} { m, n string ok bool ) - switch typ := arg1.Evaluate(t).(type) { + switch typ := functionArgs(arg1).Evaluate(t).(type) { case string: m = typ case query: @@ -271,7 +317,7 @@ func endwithFunc(arg1, arg2 query) func(query, iterator) interface{} { default: panic(errors.New("ends-with() function argument type must be string")) } - n, ok = arg2.Evaluate(t).(string) + n, ok = functionArgs(arg2).Evaluate(t).(string) if !ok { panic(errors.New("ends-with() function argument type must be string")) } @@ -286,8 +332,7 @@ func containsFunc(arg1, arg2 query) func(query, iterator) interface{} { m, n string ok bool ) - - switch typ := arg1.Evaluate(t).(type) { + switch typ := functionArgs(arg1).Evaluate(t).(type) { case string: m = typ case query: @@ -300,7 +345,7 @@ func containsFunc(arg1, arg2 query) func(query, iterator) interface{} { panic(errors.New("contains() function argument type must be string")) } - n, ok = arg2.Evaluate(t).(string) + n, ok = functionArgs(arg2).Evaluate(t).(string) if !ok { panic(errors.New("contains() function argument type must be string")) } @@ -309,15 +354,39 @@ func containsFunc(arg1, arg2 query) func(query, iterator) interface{} { } } -var ( - regnewline = regexp.MustCompile(`[\r\n\t]`) - regseqspace = regexp.MustCompile(`\s{2,}`) -) +// matchesFunc is an XPath function that tests a given string against a regexp pattern. +// Note: does not support https://www.w3.org/TR/xpath-functions-31/#func-matches 3rd optional `flags` argument; if +// needed, directly put flags in the regexp pattern, such as `(?i)^pattern$` for `i` flag. +func matchesFunc(arg1, arg2 query) func(query, iterator) interface{} { + return func(q query, t iterator) interface{} { + var s string + switch typ := functionArgs(arg1).Evaluate(t).(type) { + case string: + s = typ + case query: + node := typ.Select(t) + if node == nil { + return "" + } + s = node.Value() + } + var pattern string + var ok bool + if pattern, ok = functionArgs(arg2).Evaluate(t).(string); !ok { + panic(errors.New("matches() function second argument type must be string")) + } + re, err := getRegexp(pattern) + if err != nil { + panic(fmt.Errorf("matches() function second argument is not a valid regexp pattern, err: %s", err.Error())) + } + return re.MatchString(s) + } +} // normalizespaceFunc is XPath functions normalize-space(string?) func normalizespaceFunc(q query, t iterator) interface{} { var m string - switch typ := q.Evaluate(t).(type) { + switch typ := functionArgs(q).Evaluate(t).(type) { case string: m = typ case query: @@ -327,17 +396,33 @@ func normalizespaceFunc(q query, t iterator) interface{} { } m = node.Value() } - m = strings.TrimSpace(m) - m = regnewline.ReplaceAllString(m, " ") - m = regseqspace.ReplaceAllString(m, " ") - return m + var b = builderPool.Get().(stringBuilder) + b.Grow(len(m)) + + runeStr := []rune(strings.TrimSpace(m)) + l := len(runeStr) + for i := range runeStr { + r := runeStr[i] + isSpace := unicode.IsSpace(r) + if !(isSpace && (i+1 < l && unicode.IsSpace(runeStr[i+1]))) { + if isSpace { + r = ' ' + } + b.WriteRune(r) + } + } + result := b.String() + b.Reset() + builderPool.Put(b) + + return result } // substringFunc is XPath functions substring function returns a part of a given string. func substringFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { return func(q query, t iterator) interface{} { var m string - switch typ := arg1.Evaluate(t).(type) { + switch typ := functionArgs(arg1).Evaluate(t).(type) { case string: m = typ case query: @@ -351,14 +436,14 @@ func substringFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { var start, length float64 var ok bool - if start, ok = arg2.Evaluate(t).(float64); !ok { + if start, ok = functionArgs(arg2).Evaluate(t).(float64); !ok { panic(errors.New("substring() function first argument type must be int")) } else if start < 1 { panic(errors.New("substring() function first argument type must be >= 1")) } start-- if arg3 != nil { - if length, ok = arg3.Evaluate(t).(float64); !ok { + if length, ok = functionArgs(arg3).Evaluate(t).(float64); !ok { panic(errors.New("substring() function second argument type must be int")) } } @@ -376,7 +461,7 @@ func substringFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { func substringIndFunc(arg1, arg2 query, after bool) func(query, iterator) interface{} { return func(q query, t iterator) interface{} { var str string - switch v := arg1.Evaluate(t).(type) { + switch v := functionArgs(arg1).Evaluate(t).(type) { case string: str = v case query: @@ -387,7 +472,7 @@ func substringIndFunc(arg1, arg2 query, after bool) func(query, iterator) interf str = node.Value() } var word string - switch v := arg2.Evaluate(t).(type) { + switch v := functionArgs(arg2).Evaluate(t).(type) { case string: word = v case query: @@ -416,7 +501,7 @@ func substringIndFunc(arg1, arg2 query, after bool) func(query, iterator) interf // equal to the number of characters in a given string. func stringLengthFunc(arg1 query) func(query, iterator) interface{} { return func(q query, t iterator) interface{} { - switch v := arg1.Evaluate(t).(type) { + switch v := functionArgs(arg1).Evaluate(t).(type) { case string: return float64(len(v)) case query: @@ -433,11 +518,11 @@ func stringLengthFunc(arg1 query) func(query, iterator) interface{} { // translateFunc is XPath functions translate() function returns a replaced string. func translateFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { return func(q query, t iterator) interface{} { - str := asString(t, arg1.Evaluate(t)) - src := asString(t, arg2.Evaluate(t)) - dst := asString(t, arg3.Evaluate(t)) + str := asString(t, functionArgs(arg1).Evaluate(t)) + src := asString(t, functionArgs(arg2).Evaluate(t)) + dst := asString(t, functionArgs(arg3).Evaluate(t)) - var replace []string + replace := make([]string, 0, len(src)) for i, s := range src { d := "" if i < len(dst) { @@ -449,9 +534,20 @@ func translateFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { } } +// replaceFunc is XPath functions replace() function returns a replaced string. +func replaceFunc(arg1, arg2, arg3 query) func(query, iterator) interface{} { + return func(q query, t iterator) interface{} { + str := asString(t, functionArgs(arg1).Evaluate(t)) + src := asString(t, functionArgs(arg2).Evaluate(t)) + dst := asString(t, functionArgs(arg3).Evaluate(t)) + + return strings.Replace(str, src, dst, -1) + } +} + // notFunc is XPATH functions not(expression) function operation. func notFunc(q query, t iterator) interface{} { - switch v := q.Evaluate(t).(type) { + switch v := functionArgs(q).Evaluate(t).(type) { case bool: return !v case query: @@ -467,18 +563,52 @@ func notFunc(q query, t iterator) interface{} { // concat( string1 , string2 [, stringn]* ) func concatFunc(args ...query) func(query, iterator) interface{} { return func(q query, t iterator) interface{} { - var a []string + b := builderPool.Get().(stringBuilder) for _, v := range args { + v = functionArgs(v) + switch v := v.Evaluate(t).(type) { case string: - a = append(a, v) + b.WriteString(v) case query: node := v.Select(t) if node != nil { - a = append(a, node.Value()) + b.WriteString(node.Value()) } } } - return strings.Join(a, "") + result := b.String() + b.Reset() + builderPool.Put(b) + + return result + } +} + +// https://github.com/antchfx/xpath/issues/43 +func functionArgs(q query) query { + if _, ok := q.(*functionQuery); ok { + return q + } + return q.Clone() +} + +func reverseFunc(q query, t iterator) func() NodeNavigator { + var list []NodeNavigator + for { + node := q.Select(t) + if node == nil { + break + } + list = append(list, node.Copy()) + } + i := len(list) + return func() NodeNavigator { + if i <= 0 { + return nil + } + i-- + node := list[i] + return node } } diff --git a/vendor/github.com/antchfx/xpath/func_go110.go b/vendor/github.com/antchfx/xpath/func_go110.go index 500880f..6df30d3 100644 --- a/vendor/github.com/antchfx/xpath/func_go110.go +++ b/vendor/github.com/antchfx/xpath/func_go110.go @@ -2,8 +2,15 @@ package xpath -import "math" +import ( + "math" + "strings" +) func round(f float64) int { return int(math.Round(f)) } + +func newStringBuilder() stringBuilder{ + return &strings.Builder{} +} diff --git a/vendor/github.com/antchfx/xpath/func_pre_go110.go b/vendor/github.com/antchfx/xpath/func_pre_go110.go index 043616b..335141f 100644 --- a/vendor/github.com/antchfx/xpath/func_pre_go110.go +++ b/vendor/github.com/antchfx/xpath/func_pre_go110.go @@ -2,7 +2,10 @@ package xpath -import "math" +import ( + "bytes" + "math" +) // math.Round() is supported by Go 1.10+, // This method just compatible for version <1.10. @@ -13,3 +16,7 @@ func round(f float64) int { } return int(f + math.Copysign(0.5, f)) } + +func newStringBuilder() stringBuilder { + return &bytes.Buffer{} +} diff --git a/vendor/github.com/antchfx/xpath/go.mod b/vendor/github.com/antchfx/xpath/go.mod new file mode 100644 index 0000000..6745c56 --- /dev/null +++ b/vendor/github.com/antchfx/xpath/go.mod @@ -0,0 +1,3 @@ +module github.com/antchfx/xpath + +go 1.14 diff --git a/vendor/github.com/antchfx/xpath/operator.go b/vendor/github.com/antchfx/xpath/operator.go index 308d3cb..8c2f31f 100644 --- a/vendor/github.com/antchfx/xpath/operator.go +++ b/vendor/github.com/antchfx/xpath/operator.go @@ -163,7 +163,17 @@ func cmpNodeSetString(t iterator, op string, m, n interface{}) bool { } func cmpNodeSetNodeSet(t iterator, op string, m, n interface{}) bool { - return false + a := m.(query) + b := n.(query) + x := a.Select(t) + if x == nil { + return false + } + y := b.Select(t) + if y == nil { + return false + } + return cmpStringStringF(op, x.Value(), y.Value()) } func cmpStringNumeric(t iterator, op string, m, n interface{}) bool { diff --git a/vendor/github.com/antchfx/xpath/query.go b/vendor/github.com/antchfx/xpath/query.go index 333fe09..47f8076 100644 --- a/vendor/github.com/antchfx/xpath/query.go +++ b/vendor/github.com/antchfx/xpath/query.go @@ -22,6 +22,17 @@ type query interface { Clone() query } +// nopQuery is an empty query that always return nil for any query. +type nopQuery struct { + query +} + +func (nopQuery) Select(iterator) NodeNavigator { return nil } + +func (nopQuery) Evaluate(iterator) interface{} { return nil } + +func (nopQuery) Clone() query { return nopQuery{} } + // contextQuery is returns current node on the iterator object query. type contextQuery struct { count int @@ -65,6 +76,7 @@ func (a *ancestorQuery) Select(t iterator) NodeNavigator { return nil } first := true + node = node.Copy() a.iterator = func() NodeNavigator { if first && a.Self { first = false @@ -216,6 +228,7 @@ func (c *childQuery) position() int { type descendantQuery struct { iterator func() NodeNavigator posit int + level int Self bool Input query @@ -231,32 +244,38 @@ func (d *descendantQuery) Select(t iterator) NodeNavigator { return nil } node = node.Copy() - level := 0 + d.level = 0 + positmap := make(map[int]int) first := true d.iterator = func() NodeNavigator { if first && d.Self { first = false if d.Predicate(node) { + d.posit = 1 + positmap[d.level] = 1 return node } } for { if node.MoveToChild() { - level++ + d.level = d.level + 1 + positmap[d.level] = 0 } else { for { - if level == 0 { + if d.level == 0 { return nil } if node.MoveToNext() { break } node.MoveToParent() - level-- + d.level = d.level - 1 } } if d.Predicate(node) { + positmap[d.level]++ + d.posit = positmap[d.level] return node } } @@ -264,7 +283,6 @@ func (d *descendantQuery) Select(t iterator) NodeNavigator { } if node := d.iterator(); node != nil { - d.posit++ return node } d.iterator = nil @@ -286,12 +304,17 @@ func (d *descendantQuery) position() int { return d.posit } +func (d *descendantQuery) depth() int { + return d.level +} + func (d *descendantQuery) Clone() query { return &descendantQuery{Self: d.Self, Input: d.Input.Clone(), Predicate: d.Predicate} } // followingQuery is an XPath following node query.(following::*|following-sibling::*) type followingQuery struct { + posit int iterator func() NodeNavigator Input query @@ -302,6 +325,7 @@ type followingQuery struct { func (f *followingQuery) Select(t iterator) NodeNavigator { for { if f.iterator == nil { + f.posit = 0 node := f.Input.Select(t) if node == nil { return nil @@ -314,12 +338,13 @@ func (f *followingQuery) Select(t iterator) NodeNavigator { return nil } if f.Predicate(node) { + f.posit++ return node } } } } else { - var q query // descendant query + var q *descendantQuery // descendant query f.iterator = func() NodeNavigator { for { if q == nil { @@ -336,6 +361,7 @@ func (f *followingQuery) Select(t iterator) NodeNavigator { t.Current().MoveTo(node) } if node := q.Select(t); node != nil { + f.posit = q.posit return node } q = nil @@ -364,9 +390,14 @@ func (f *followingQuery) Clone() query { return &followingQuery{Input: f.Input.Clone(), Sibling: f.Sibling, Predicate: f.Predicate} } +func (f *followingQuery) position() int { + return f.posit +} + // precedingQuery is an XPath preceding node query.(preceding::*) type precedingQuery struct { iterator func() NodeNavigator + posit int Input query Sibling bool // The matching sibling node of current node. Predicate func(NodeNavigator) bool @@ -375,6 +406,7 @@ type precedingQuery struct { func (p *precedingQuery) Select(t iterator) NodeNavigator { for { if p.iterator == nil { + p.posit = 0 node := p.Input.Select(t) if node == nil { return nil @@ -387,6 +419,7 @@ func (p *precedingQuery) Select(t iterator) NodeNavigator { return nil } if p.Predicate(node) { + p.posit++ return node } } @@ -400,6 +433,7 @@ func (p *precedingQuery) Select(t iterator) NodeNavigator { if !node.MoveToParent() { return nil } + p.posit = 0 } q = &descendantQuery{ Self: true, @@ -409,6 +443,7 @@ func (p *precedingQuery) Select(t iterator) NodeNavigator { t.Current().MoveTo(node) } if node := q.Select(t); node != nil { + p.posit++ return node } q = nil @@ -436,6 +471,10 @@ func (p *precedingQuery) Clone() query { return &precedingQuery{Input: p.Input.Clone(), Sibling: p.Sibling, Predicate: p.Predicate} } +func (p *precedingQuery) position() int { + return p.posit +} + // parentQuery is an XPath parent node query.(parent::*) type parentQuery struct { Input query @@ -504,6 +543,8 @@ func (s *selfQuery) Clone() query { type filterQuery struct { Input query Predicate query + posit int + positmap map[int]int } func (f *filterQuery) do(t iterator) bool { @@ -514,8 +555,8 @@ func (f *filterQuery) do(t iterator) bool { case reflect.String: return len(val.String()) > 0 case reflect.Float64: - pt := float64(getNodePosition(f.Input)) - return int(val.Float()) == int(pt) + pt := getNodePosition(f.Input) + return int(val.Float()) == pt default: if q, ok := f.Predicate.(query); ok { return q.Select(t) != nil @@ -524,17 +565,29 @@ func (f *filterQuery) do(t iterator) bool { return false } +func (f *filterQuery) position() int { + return f.posit +} + func (f *filterQuery) Select(t iterator) NodeNavigator { + if f.positmap == nil { + f.positmap = make(map[int]int) + } for { + node := f.Input.Select(t) if node == nil { return node } node = node.Copy() - //fmt.Println(node.LocalName()) t.Current().MoveTo(node) if f.do(t) { + // fix https://github.com/antchfx/htmlquery/issues/26 + // Calculate and keep the each of matching node's position in the same depth. + level := getNodeDepth(f.Input) + f.positmap[level]++ + f.posit = f.positmap[level] return node } } @@ -549,8 +602,9 @@ func (f *filterQuery) Clone() query { return &filterQuery{Input: f.Input.Clone(), Predicate: f.Predicate.Clone()} } -// functionQuery is an XPath function that call a function to returns -// value of current NodeNavigator node. +// functionQuery is an XPath function that returns a computed value for +// the Evaluate call of the current NodeNavigator node. Select call isn't +// applicable for functionQuery. type functionQuery struct { Input query // Node Set Func func(query, iterator) interface{} // The xpath function. @@ -570,6 +624,34 @@ func (f *functionQuery) Clone() query { return &functionQuery{Input: f.Input.Clone(), Func: f.Func} } +// transformFunctionQuery diffs from functionQuery where the latter computes a scalar +// value (number,string,boolean) for the current NodeNavigator node while the former +// (transformFunctionQuery) performs a mapping or transform of the current NodeNavigator +// and returns a new NodeNavigator. It is used for non-scalar XPath functions such as +// reverse(), remove(), subsequence(), unordered(), etc. +type transformFunctionQuery struct { + Input query + Func func(query, iterator) func() NodeNavigator + iterator func() NodeNavigator +} + +func (f *transformFunctionQuery) Select(t iterator) NodeNavigator { + if f.iterator == nil { + f.iterator = f.Func(f.Input, t) + } + return f.iterator() +} + +func (f *transformFunctionQuery) Evaluate(t iterator) interface{} { + f.Input.Evaluate(t) + f.iterator = nil + return f +} + +func (f *transformFunctionQuery) Clone() query { + return &transformFunctionQuery{Input: f.Input.Clone(), Func: f.Func} +} + // constantQuery is an XPath constant operand. type constantQuery struct { Val interface{} @@ -731,7 +813,8 @@ type unionQuery struct { func (u *unionQuery) Select(t iterator) NodeNavigator { if u.iterator == nil { - var m = make(map[uint64]NodeNavigator) + var list []NodeNavigator + var m = make(map[uint64]bool) root := t.Current().Copy() for { node := u.Left.Select(t) @@ -740,7 +823,8 @@ func (u *unionQuery) Select(t iterator) NodeNavigator { } code := getHashCode(node.Copy()) if _, ok := m[code]; !ok { - m[code] = node.Copy() + m[code] = true + list = append(list, node.Copy()) } } t.Current().MoveTo(root) @@ -751,16 +835,11 @@ func (u *unionQuery) Select(t iterator) NodeNavigator { } code := getHashCode(node.Copy()) if _, ok := m[code]; !ok { - m[code] = node.Copy() + m[code] = true + list = append(list, node.Copy()) } } - list := make([]NodeNavigator, len(m)) var i int - for _, v := range m { - list[i] = v - i++ - } - i = 0 u.iterator = func() NodeNavigator { if i >= len(list) { return nil @@ -789,8 +868,18 @@ func getHashCode(n NodeNavigator) uint64 { switch n.NodeType() { case AttributeNode, TextNode, CommentNode: sb.WriteString(fmt.Sprintf("%s=%s", n.LocalName(), n.Value())) - if n.MoveToParent() { - sb.WriteString(n.LocalName()) + // https://github.com/antchfx/htmlquery/issues/25 + d := 1 + for n.MoveToPrevious() { + d++ + } + sb.WriteString(fmt.Sprintf("-%d", d)) + for n.MoveToParent() { + d = 1 + for n.MoveToPrevious() { + d++ + } + sb.WriteString(fmt.Sprintf("-%d", d)) } case ElementNode: sb.WriteString(n.Prefix() + n.LocalName()) @@ -822,3 +911,13 @@ func getNodePosition(q query) int { } return 1 } + +func getNodeDepth(q query) int { + type Depth interface { + depth() int + } + if count, ok := q.(Depth); ok { + return count.depth() + } + return 0 +} diff --git a/vendor/github.com/antchfx/xpath/xpath.go b/vendor/github.com/antchfx/xpath/xpath.go index 7e3f52c..5f6aa89 100644 --- a/vendor/github.com/antchfx/xpath/xpath.go +++ b/vendor/github.com/antchfx/xpath/xpath.go @@ -2,6 +2,7 @@ package xpath import ( "errors" + "fmt" ) // NodeType represents a type of XPath node. @@ -144,6 +145,9 @@ func Compile(expr string) (*Expr, error) { if err != nil { return nil, err } + if qy == nil { + return nil, fmt.Errorf(fmt.Sprintf("undeclared variable in XPath expression: %s", expr)) + } return &Expr{s: expr, q: qy}, nil } @@ -151,7 +155,7 @@ func Compile(expr string) (*Expr, error) { func MustCompile(expr string) *Expr { exp, err := Compile(expr) if err != nil { - return nil + return &Expr{s: expr, q: nopQuery{}} } return exp } diff --git a/vendor/github.com/gobuffalo/here/dir.go b/vendor/github.com/gobuffalo/here/dir.go index ecd75dd..95be28d 100644 --- a/vendor/github.com/gobuffalo/here/dir.go +++ b/vendor/github.com/gobuffalo/here/dir.go @@ -2,6 +2,7 @@ package here import ( "encoding/json" + "fmt" "os" "path/filepath" ) @@ -48,7 +49,7 @@ func (h Here) Dir(p string) (Info, error) { }) if err != nil { - return i, err + return i, fmt.Errorf("here.Dir: %s: %w", p, err) } return h.cache(i.ImportPath, func(p string) (Info, error) { @@ -72,12 +73,12 @@ func fromNonGoDir(dir string) (Info, error) { if nonGoDirRx.MatchString(err.Error()) { return i, nil } - return i, err + return i, fmt.Errorf("here.nonGoDir: %s: %w", dir, err) } if err := json.Unmarshal(b, &i.Module); err != nil { - return i, err + return i, fmt.Errorf("here.nonGoDir: %s: %w", dir, err) } - return i, err + return i, nil } diff --git a/vendor/github.com/gobuffalo/here/go.mod b/vendor/github.com/gobuffalo/here/go.mod index ebbb1db..26c922f 100644 --- a/vendor/github.com/gobuffalo/here/go.mod +++ b/vendor/github.com/gobuffalo/here/go.mod @@ -4,8 +4,8 @@ go 1.13 require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/stretchr/testify v1.4.0 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect - gopkg.in/yaml.v2 v2.2.7 // indirect + github.com/kr/pretty v0.2.0 // indirect + github.com/stretchr/testify v1.5.1 + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect ) diff --git a/vendor/github.com/gobuffalo/here/go.sum b/vendor/github.com/gobuffalo/here/go.sum index bfe6074..e4630f1 100644 --- a/vendor/github.com/gobuffalo/here/go.sum +++ b/vendor/github.com/gobuffalo/here/go.sum @@ -1,19 +1,22 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/gobuffalo/here/here.go b/vendor/github.com/gobuffalo/here/here.go index e1d5765..69966a7 100644 --- a/vendor/github.com/gobuffalo/here/here.go +++ b/vendor/github.com/gobuffalo/here/here.go @@ -35,7 +35,7 @@ func run(n string, args ...string) ([]byte, error) { c.Stderr = ebb err := c.Run() if err != nil { - return nil, fmt.Errorf("%s: %s", err, ebb) + return nil, fmt.Errorf("%v %w: %s", c.Args, err, ebb) } return bb.Bytes(), nil @@ -48,7 +48,7 @@ func (h Here) cache(p string, fn func(string) (Info, error)) (Info, error) { } i, err := fn(p) if err != nil { - return i, err + return i, fmt.Errorf("here.cache: %s: %w", p, err) } h.infos.Store(p, i) return i, nil diff --git a/vendor/github.com/gobuffalo/here/parse.go b/vendor/github.com/gobuffalo/here/parse.go index 9227b93..9b6abcd 100644 --- a/vendor/github.com/gobuffalo/here/parse.go +++ b/vendor/github.com/gobuffalo/here/parse.go @@ -57,6 +57,7 @@ func (i Info) build(p, pkg, name string) (Path, error) { pt.Name = "/" + pt.Name } pt.Name = strings.TrimPrefix(pt.Name, i.Dir) + return pt, nil } diff --git a/vendor/github.com/gobuffalo/here/pkg.go b/vendor/github.com/gobuffalo/here/pkg.go index 31ce170..d79b58a 100644 --- a/vendor/github.com/gobuffalo/here/pkg.go +++ b/vendor/github.com/gobuffalo/here/pkg.go @@ -32,7 +32,7 @@ func (h Here) Package(p string) (Info, error) { }) if err != nil { - return i, err + return i, fmt.Errorf("here.Package: %s: %w", p, err) } h.cache(i.Dir, func(p string) (Info, error) { diff --git a/vendor/github.com/golang/groupcache/LICENSE b/vendor/github.com/golang/groupcache/LICENSE new file mode 100644 index 0000000..37ec93a --- /dev/null +++ b/vendor/github.com/golang/groupcache/LICENSE @@ -0,0 +1,191 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/golang/groupcache/lru/lru.go b/vendor/github.com/golang/groupcache/lru/lru.go new file mode 100644 index 0000000..eac1c76 --- /dev/null +++ b/vendor/github.com/golang/groupcache/lru/lru.go @@ -0,0 +1,133 @@ +/* +Copyright 2013 Google Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package lru implements an LRU cache. +package lru + +import "container/list" + +// Cache is an LRU cache. It is not safe for concurrent access. +type Cache struct { + // MaxEntries is the maximum number of cache entries before + // an item is evicted. Zero means no limit. + MaxEntries int + + // OnEvicted optionally specifies a callback function to be + // executed when an entry is purged from the cache. + OnEvicted func(key Key, value interface{}) + + ll *list.List + cache map[interface{}]*list.Element +} + +// A Key may be any value that is comparable. See http://golang.org/ref/spec#Comparison_operators +type Key interface{} + +type entry struct { + key Key + value interface{} +} + +// New creates a new Cache. +// If maxEntries is zero, the cache has no limit and it's assumed +// that eviction is done by the caller. +func New(maxEntries int) *Cache { + return &Cache{ + MaxEntries: maxEntries, + ll: list.New(), + cache: make(map[interface{}]*list.Element), + } +} + +// Add adds a value to the cache. +func (c *Cache) Add(key Key, value interface{}) { + if c.cache == nil { + c.cache = make(map[interface{}]*list.Element) + c.ll = list.New() + } + if ee, ok := c.cache[key]; ok { + c.ll.MoveToFront(ee) + ee.Value.(*entry).value = value + return + } + ele := c.ll.PushFront(&entry{key, value}) + c.cache[key] = ele + if c.MaxEntries != 0 && c.ll.Len() > c.MaxEntries { + c.RemoveOldest() + } +} + +// Get looks up a key's value from the cache. +func (c *Cache) Get(key Key) (value interface{}, ok bool) { + if c.cache == nil { + return + } + if ele, hit := c.cache[key]; hit { + c.ll.MoveToFront(ele) + return ele.Value.(*entry).value, true + } + return +} + +// Remove removes the provided key from the cache. +func (c *Cache) Remove(key Key) { + if c.cache == nil { + return + } + if ele, hit := c.cache[key]; hit { + c.removeElement(ele) + } +} + +// RemoveOldest removes the oldest item from the cache. +func (c *Cache) RemoveOldest() { + if c.cache == nil { + return + } + ele := c.ll.Back() + if ele != nil { + c.removeElement(ele) + } +} + +func (c *Cache) removeElement(e *list.Element) { + c.ll.Remove(e) + kv := e.Value.(*entry) + delete(c.cache, kv.key) + if c.OnEvicted != nil { + c.OnEvicted(kv.key, kv.value) + } +} + +// Len returns the number of items in the cache. +func (c *Cache) Len() int { + if c.cache == nil { + return 0 + } + return c.ll.Len() +} + +// Clear purges all stored items from the cache. +func (c *Cache) Clear() { + if c.OnEvicted != nil { + for _, e := range c.cache { + kv := e.Value.(*entry) + c.OnEvicted(kv.key, kv.value) + } + } + c.ll = nil + c.cache = nil +} diff --git a/vendor/github.com/golang/snappy/AUTHORS b/vendor/github.com/golang/snappy/AUTHORS index bcfa195..203e84e 100644 --- a/vendor/github.com/golang/snappy/AUTHORS +++ b/vendor/github.com/golang/snappy/AUTHORS @@ -8,8 +8,10 @@ # Please keep the list sorted. +Amazon.com, Inc Damian Gryski Google Inc. Jan Mercl <0xjnml@gmail.com> +Klaus Post Rodolfo Carvalho Sebastien Binet diff --git a/vendor/github.com/golang/snappy/CONTRIBUTORS b/vendor/github.com/golang/snappy/CONTRIBUTORS index 931ae31..d991473 100644 --- a/vendor/github.com/golang/snappy/CONTRIBUTORS +++ b/vendor/github.com/golang/snappy/CONTRIBUTORS @@ -28,7 +28,9 @@ Damian Gryski Jan Mercl <0xjnml@gmail.com> +Jonathan Swinney Kai Backman +Klaus Post Marc-Antoine Ruel Nigel Tao Rob Pike diff --git a/vendor/github.com/golang/snappy/decode.go b/vendor/github.com/golang/snappy/decode.go index 72efb03..f1e04b1 100644 --- a/vendor/github.com/golang/snappy/decode.go +++ b/vendor/github.com/golang/snappy/decode.go @@ -52,6 +52,8 @@ const ( // Otherwise, a newly allocated slice will be returned. // // The dst and src must not overlap. It is valid to pass a nil dst. +// +// Decode handles the Snappy block format, not the Snappy stream format. func Decode(dst, src []byte) ([]byte, error) { dLen, s, err := decodedLen(src) if err != nil { @@ -83,6 +85,8 @@ func NewReader(r io.Reader) *Reader { } // Reader is an io.Reader that can read Snappy-compressed bytes. +// +// Reader handles the Snappy stream format, not the Snappy block format. type Reader struct { r io.Reader err error diff --git a/vendor/github.com/golang/snappy/decode_arm64.s b/vendor/github.com/golang/snappy/decode_arm64.s new file mode 100644 index 0000000..bfafa0c --- /dev/null +++ b/vendor/github.com/golang/snappy/decode_arm64.s @@ -0,0 +1,503 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !appengine +// +build gc +// +build !noasm + +#include "textflag.h" + +// The asm code generally follows the pure Go code in decode_other.go, except +// where marked with a "!!!". + +// func decode(dst, src []byte) int +// +// All local variables fit into registers. The non-zero stack size is only to +// spill registers and push args when issuing a CALL. The register allocation: +// - R2 scratch +// - R3 scratch +// - R4 length or x +// - R5 offset +// - R6 &src[s] +// - R7 &dst[d] +// + R8 dst_base +// + R9 dst_len +// + R10 dst_base + dst_len +// + R11 src_base +// + R12 src_len +// + R13 src_base + src_len +// - R14 used by doCopy +// - R15 used by doCopy +// +// The registers R8-R13 (marked with a "+") are set at the start of the +// function, and after a CALL returns, and are not otherwise modified. +// +// The d variable is implicitly R7 - R8, and len(dst)-d is R10 - R7. +// The s variable is implicitly R6 - R11, and len(src)-s is R13 - R6. +TEXT ·decode(SB), NOSPLIT, $56-56 + // Initialize R6, R7 and R8-R13. + MOVD dst_base+0(FP), R8 + MOVD dst_len+8(FP), R9 + MOVD R8, R7 + MOVD R8, R10 + ADD R9, R10, R10 + MOVD src_base+24(FP), R11 + MOVD src_len+32(FP), R12 + MOVD R11, R6 + MOVD R11, R13 + ADD R12, R13, R13 + +loop: + // for s < len(src) + CMP R13, R6 + BEQ end + + // R4 = uint32(src[s]) + // + // switch src[s] & 0x03 + MOVBU (R6), R4 + MOVW R4, R3 + ANDW $3, R3 + MOVW $1, R1 + CMPW R1, R3 + BGE tagCopy + + // ---------------------------------------- + // The code below handles literal tags. + + // case tagLiteral: + // x := uint32(src[s] >> 2) + // switch + MOVW $60, R1 + ADD R4>>2, ZR, R4 + CMPW R4, R1 + BLS tagLit60Plus + + // case x < 60: + // s++ + ADD $1, R6, R6 + +doLit: + // This is the end of the inner "switch", when we have a literal tag. + // + // We assume that R4 == x and x fits in a uint32, where x is the variable + // used in the pure Go decode_other.go code. + + // length = int(x) + 1 + // + // Unlike the pure Go code, we don't need to check if length <= 0 because + // R4 can hold 64 bits, so the increment cannot overflow. + ADD $1, R4, R4 + + // Prepare to check if copying length bytes will run past the end of dst or + // src. + // + // R2 = len(dst) - d + // R3 = len(src) - s + MOVD R10, R2 + SUB R7, R2, R2 + MOVD R13, R3 + SUB R6, R3, R3 + + // !!! Try a faster technique for short (16 or fewer bytes) copies. + // + // if length > 16 || len(dst)-d < 16 || len(src)-s < 16 { + // goto callMemmove // Fall back on calling runtime·memmove. + // } + // + // The C++ snappy code calls this TryFastAppend. It also checks len(src)-s + // against 21 instead of 16, because it cannot assume that all of its input + // is contiguous in memory and so it needs to leave enough source bytes to + // read the next tag without refilling buffers, but Go's Decode assumes + // contiguousness (the src argument is a []byte). + MOVD $16, R1 + CMP R1, R4 + BGT callMemmove + CMP R1, R2 + BLT callMemmove + CMP R1, R3 + BLT callMemmove + + // !!! Implement the copy from src to dst as a 16-byte load and store. + // (Decode's documentation says that dst and src must not overlap.) + // + // This always copies 16 bytes, instead of only length bytes, but that's + // OK. If the input is a valid Snappy encoding then subsequent iterations + // will fix up the overrun. Otherwise, Decode returns a nil []byte (and a + // non-nil error), so the overrun will be ignored. + // + // Note that on arm64, it is legal and cheap to issue unaligned 8-byte or + // 16-byte loads and stores. This technique probably wouldn't be as + // effective on architectures that are fussier about alignment. + + VLD1 0(R6), [V0.B16] + VST1 [V0.B16], 0(R7) + + // d += length + // s += length + ADD R4, R7, R7 + ADD R4, R6, R6 + B loop + +callMemmove: + // if length > len(dst)-d || length > len(src)-s { etc } + CMP R2, R4 + BGT errCorrupt + CMP R3, R4 + BGT errCorrupt + + // copy(dst[d:], src[s:s+length]) + // + // This means calling runtime·memmove(&dst[d], &src[s], length), so we push + // R7, R6 and R4 as arguments. Coincidentally, we also need to spill those + // three registers to the stack, to save local variables across the CALL. + MOVD R7, 8(RSP) + MOVD R6, 16(RSP) + MOVD R4, 24(RSP) + MOVD R7, 32(RSP) + MOVD R6, 40(RSP) + MOVD R4, 48(RSP) + CALL runtime·memmove(SB) + + // Restore local variables: unspill registers from the stack and + // re-calculate R8-R13. + MOVD 32(RSP), R7 + MOVD 40(RSP), R6 + MOVD 48(RSP), R4 + MOVD dst_base+0(FP), R8 + MOVD dst_len+8(FP), R9 + MOVD R8, R10 + ADD R9, R10, R10 + MOVD src_base+24(FP), R11 + MOVD src_len+32(FP), R12 + MOVD R11, R13 + ADD R12, R13, R13 + + // d += length + // s += length + ADD R4, R7, R7 + ADD R4, R6, R6 + B loop + +tagLit60Plus: + // !!! This fragment does the + // + // s += x - 58; if uint(s) > uint(len(src)) { etc } + // + // checks. In the asm version, we code it once instead of once per switch case. + ADD R4, R6, R6 + SUB $58, R6, R6 + MOVD R6, R3 + SUB R11, R3, R3 + CMP R12, R3 + BGT errCorrupt + + // case x == 60: + MOVW $61, R1 + CMPW R1, R4 + BEQ tagLit61 + BGT tagLit62Plus + + // x = uint32(src[s-1]) + MOVBU -1(R6), R4 + B doLit + +tagLit61: + // case x == 61: + // x = uint32(src[s-2]) | uint32(src[s-1])<<8 + MOVHU -2(R6), R4 + B doLit + +tagLit62Plus: + MOVW $62, R1 + CMPW R1, R4 + BHI tagLit63 + + // case x == 62: + // x = uint32(src[s-3]) | uint32(src[s-2])<<8 | uint32(src[s-1])<<16 + MOVHU -3(R6), R4 + MOVBU -1(R6), R3 + ORR R3<<16, R4 + B doLit + +tagLit63: + // case x == 63: + // x = uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24 + MOVWU -4(R6), R4 + B doLit + + // The code above handles literal tags. + // ---------------------------------------- + // The code below handles copy tags. + +tagCopy4: + // case tagCopy4: + // s += 5 + ADD $5, R6, R6 + + // if uint(s) > uint(len(src)) { etc } + MOVD R6, R3 + SUB R11, R3, R3 + CMP R12, R3 + BGT errCorrupt + + // length = 1 + int(src[s-5])>>2 + MOVD $1, R1 + ADD R4>>2, R1, R4 + + // offset = int(uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24) + MOVWU -4(R6), R5 + B doCopy + +tagCopy2: + // case tagCopy2: + // s += 3 + ADD $3, R6, R6 + + // if uint(s) > uint(len(src)) { etc } + MOVD R6, R3 + SUB R11, R3, R3 + CMP R12, R3 + BGT errCorrupt + + // length = 1 + int(src[s-3])>>2 + MOVD $1, R1 + ADD R4>>2, R1, R4 + + // offset = int(uint32(src[s-2]) | uint32(src[s-1])<<8) + MOVHU -2(R6), R5 + B doCopy + +tagCopy: + // We have a copy tag. We assume that: + // - R3 == src[s] & 0x03 + // - R4 == src[s] + MOVD $2, R1 + CMP R1, R3 + BEQ tagCopy2 + BGT tagCopy4 + + // case tagCopy1: + // s += 2 + ADD $2, R6, R6 + + // if uint(s) > uint(len(src)) { etc } + MOVD R6, R3 + SUB R11, R3, R3 + CMP R12, R3 + BGT errCorrupt + + // offset = int(uint32(src[s-2])&0xe0<<3 | uint32(src[s-1])) + MOVD R4, R5 + AND $0xe0, R5 + MOVBU -1(R6), R3 + ORR R5<<3, R3, R5 + + // length = 4 + int(src[s-2])>>2&0x7 + MOVD $7, R1 + AND R4>>2, R1, R4 + ADD $4, R4, R4 + +doCopy: + // This is the end of the outer "switch", when we have a copy tag. + // + // We assume that: + // - R4 == length && R4 > 0 + // - R5 == offset + + // if offset <= 0 { etc } + MOVD $0, R1 + CMP R1, R5 + BLE errCorrupt + + // if d < offset { etc } + MOVD R7, R3 + SUB R8, R3, R3 + CMP R5, R3 + BLT errCorrupt + + // if length > len(dst)-d { etc } + MOVD R10, R3 + SUB R7, R3, R3 + CMP R3, R4 + BGT errCorrupt + + // forwardCopy(dst[d:d+length], dst[d-offset:]); d += length + // + // Set: + // - R14 = len(dst)-d + // - R15 = &dst[d-offset] + MOVD R10, R14 + SUB R7, R14, R14 + MOVD R7, R15 + SUB R5, R15, R15 + + // !!! Try a faster technique for short (16 or fewer bytes) forward copies. + // + // First, try using two 8-byte load/stores, similar to the doLit technique + // above. Even if dst[d:d+length] and dst[d-offset:] can overlap, this is + // still OK if offset >= 8. Note that this has to be two 8-byte load/stores + // and not one 16-byte load/store, and the first store has to be before the + // second load, due to the overlap if offset is in the range [8, 16). + // + // if length > 16 || offset < 8 || len(dst)-d < 16 { + // goto slowForwardCopy + // } + // copy 16 bytes + // d += length + MOVD $16, R1 + MOVD $8, R0 + CMP R1, R4 + BGT slowForwardCopy + CMP R0, R5 + BLT slowForwardCopy + CMP R1, R14 + BLT slowForwardCopy + MOVD 0(R15), R2 + MOVD R2, 0(R7) + MOVD 8(R15), R3 + MOVD R3, 8(R7) + ADD R4, R7, R7 + B loop + +slowForwardCopy: + // !!! If the forward copy is longer than 16 bytes, or if offset < 8, we + // can still try 8-byte load stores, provided we can overrun up to 10 extra + // bytes. As above, the overrun will be fixed up by subsequent iterations + // of the outermost loop. + // + // The C++ snappy code calls this technique IncrementalCopyFastPath. Its + // commentary says: + // + // ---- + // + // The main part of this loop is a simple copy of eight bytes at a time + // until we've copied (at least) the requested amount of bytes. However, + // if d and d-offset are less than eight bytes apart (indicating a + // repeating pattern of length < 8), we first need to expand the pattern in + // order to get the correct results. For instance, if the buffer looks like + // this, with the eight-byte and patterns marked as + // intervals: + // + // abxxxxxxxxxxxx + // [------] d-offset + // [------] d + // + // a single eight-byte copy from to will repeat the pattern + // once, after which we can move two bytes without moving : + // + // ababxxxxxxxxxx + // [------] d-offset + // [------] d + // + // and repeat the exercise until the two no longer overlap. + // + // This allows us to do very well in the special case of one single byte + // repeated many times, without taking a big hit for more general cases. + // + // The worst case of extra writing past the end of the match occurs when + // offset == 1 and length == 1; the last copy will read from byte positions + // [0..7] and write to [4..11], whereas it was only supposed to write to + // position 1. Thus, ten excess bytes. + // + // ---- + // + // That "10 byte overrun" worst case is confirmed by Go's + // TestSlowForwardCopyOverrun, which also tests the fixUpSlowForwardCopy + // and finishSlowForwardCopy algorithm. + // + // if length > len(dst)-d-10 { + // goto verySlowForwardCopy + // } + SUB $10, R14, R14 + CMP R14, R4 + BGT verySlowForwardCopy + +makeOffsetAtLeast8: + // !!! As above, expand the pattern so that offset >= 8 and we can use + // 8-byte load/stores. + // + // for offset < 8 { + // copy 8 bytes from dst[d-offset:] to dst[d:] + // length -= offset + // d += offset + // offset += offset + // // The two previous lines together means that d-offset, and therefore + // // R15, is unchanged. + // } + MOVD $8, R1 + CMP R1, R5 + BGE fixUpSlowForwardCopy + MOVD (R15), R3 + MOVD R3, (R7) + SUB R5, R4, R4 + ADD R5, R7, R7 + ADD R5, R5, R5 + B makeOffsetAtLeast8 + +fixUpSlowForwardCopy: + // !!! Add length (which might be negative now) to d (implied by R7 being + // &dst[d]) so that d ends up at the right place when we jump back to the + // top of the loop. Before we do that, though, we save R7 to R2 so that, if + // length is positive, copying the remaining length bytes will write to the + // right place. + MOVD R7, R2 + ADD R4, R7, R7 + +finishSlowForwardCopy: + // !!! Repeat 8-byte load/stores until length <= 0. Ending with a negative + // length means that we overrun, but as above, that will be fixed up by + // subsequent iterations of the outermost loop. + MOVD $0, R1 + CMP R1, R4 + BLE loop + MOVD (R15), R3 + MOVD R3, (R2) + ADD $8, R15, R15 + ADD $8, R2, R2 + SUB $8, R4, R4 + B finishSlowForwardCopy + +verySlowForwardCopy: + // verySlowForwardCopy is a simple implementation of forward copy. In C + // parlance, this is a do/while loop instead of a while loop, since we know + // that length > 0. In Go syntax: + // + // for { + // dst[d] = dst[d - offset] + // d++ + // length-- + // if length == 0 { + // break + // } + // } + MOVB (R15), R3 + MOVB R3, (R7) + ADD $1, R15, R15 + ADD $1, R7, R7 + SUB $1, R4, R4 + MOVD $0, R1 + CMP R1, R4 + BNE verySlowForwardCopy + B loop + + // The code above handles copy tags. + // ---------------------------------------- + +end: + // This is the end of the "for s < len(src)". + // + // if d != len(dst) { etc } + CMP R10, R7 + BNE errCorrupt + + // return 0 + MOVD $0, ret+48(FP) + RET + +errCorrupt: + // return decodeErrCodeCorrupt + MOVD $1, R2 + MOVD R2, ret+48(FP) + RET diff --git a/vendor/github.com/golang/snappy/decode_amd64.go b/vendor/github.com/golang/snappy/decode_asm.go similarity index 93% rename from vendor/github.com/golang/snappy/decode_amd64.go rename to vendor/github.com/golang/snappy/decode_asm.go index fcd192b..7082b34 100644 --- a/vendor/github.com/golang/snappy/decode_amd64.go +++ b/vendor/github.com/golang/snappy/decode_asm.go @@ -5,6 +5,7 @@ // +build !appengine // +build gc // +build !noasm +// +build amd64 arm64 package snappy diff --git a/vendor/github.com/golang/snappy/decode_other.go b/vendor/github.com/golang/snappy/decode_other.go index 8c9f204..2f672be 100644 --- a/vendor/github.com/golang/snappy/decode_other.go +++ b/vendor/github.com/golang/snappy/decode_other.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !amd64 appengine !gc noasm +// +build !amd64,!arm64 appengine !gc noasm package snappy @@ -85,14 +85,28 @@ func decode(dst, src []byte) int { if offset <= 0 || d < offset || length > len(dst)-d { return decodeErrCodeCorrupt } - // Copy from an earlier sub-slice of dst to a later sub-slice. Unlike - // the built-in copy function, this byte-by-byte copy always runs + // Copy from an earlier sub-slice of dst to a later sub-slice. + // If no overlap, use the built-in copy: + if offset >= length { + copy(dst[d:d+length], dst[d-offset:]) + d += length + continue + } + + // Unlike the built-in copy function, this byte-by-byte copy always runs // forwards, even if the slices overlap. Conceptually, this is: // // d += forwardCopy(dst[d:d+length], dst[d-offset:]) - for end := d + length; d != end; d++ { - dst[d] = dst[d-offset] + // + // We align the slices into a and b and show the compiler they are the same size. + // This allows the loop to run without bounds checks. + a := dst[d : d+length] + b := dst[d-offset:] + b = b[:len(a)] + for i := range a { + a[i] = b[i] } + d += length } if d != len(dst) { return decodeErrCodeCorrupt diff --git a/vendor/github.com/golang/snappy/encode.go b/vendor/github.com/golang/snappy/encode.go index 8d393e9..7f23657 100644 --- a/vendor/github.com/golang/snappy/encode.go +++ b/vendor/github.com/golang/snappy/encode.go @@ -15,6 +15,8 @@ import ( // Otherwise, a newly allocated slice will be returned. // // The dst and src must not overlap. It is valid to pass a nil dst. +// +// Encode handles the Snappy block format, not the Snappy stream format. func Encode(dst, src []byte) []byte { if n := MaxEncodedLen(len(src)); n < 0 { panic(ErrTooLarge) @@ -139,6 +141,8 @@ func NewBufferedWriter(w io.Writer) *Writer { } // Writer is an io.Writer that can write Snappy-compressed bytes. +// +// Writer handles the Snappy stream format, not the Snappy block format. type Writer struct { w io.Writer err error diff --git a/vendor/github.com/golang/snappy/encode_arm64.s b/vendor/github.com/golang/snappy/encode_arm64.s new file mode 100644 index 0000000..1f565ee --- /dev/null +++ b/vendor/github.com/golang/snappy/encode_arm64.s @@ -0,0 +1,729 @@ +// Copyright 2020 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !appengine +// +build gc +// +build !noasm + +#include "textflag.h" + +// The asm code generally follows the pure Go code in encode_other.go, except +// where marked with a "!!!". + +// ---------------------------------------------------------------------------- + +// func emitLiteral(dst, lit []byte) int +// +// All local variables fit into registers. The register allocation: +// - R3 len(lit) +// - R4 n +// - R6 return value +// - R8 &dst[i] +// - R10 &lit[0] +// +// The 32 bytes of stack space is to call runtime·memmove. +// +// The unusual register allocation of local variables, such as R10 for the +// source pointer, matches the allocation used at the call site in encodeBlock, +// which makes it easier to manually inline this function. +TEXT ·emitLiteral(SB), NOSPLIT, $32-56 + MOVD dst_base+0(FP), R8 + MOVD lit_base+24(FP), R10 + MOVD lit_len+32(FP), R3 + MOVD R3, R6 + MOVW R3, R4 + SUBW $1, R4, R4 + + MOVW $60, R2 + CMPW R2, R4 + BLT oneByte + MOVW $256, R2 + CMPW R2, R4 + BLT twoBytes + +threeBytes: + MOVD $0xf4, R2 + MOVB R2, 0(R8) + MOVW R4, 1(R8) + ADD $3, R8, R8 + ADD $3, R6, R6 + B memmove + +twoBytes: + MOVD $0xf0, R2 + MOVB R2, 0(R8) + MOVB R4, 1(R8) + ADD $2, R8, R8 + ADD $2, R6, R6 + B memmove + +oneByte: + LSLW $2, R4, R4 + MOVB R4, 0(R8) + ADD $1, R8, R8 + ADD $1, R6, R6 + +memmove: + MOVD R6, ret+48(FP) + + // copy(dst[i:], lit) + // + // This means calling runtime·memmove(&dst[i], &lit[0], len(lit)), so we push + // R8, R10 and R3 as arguments. + MOVD R8, 8(RSP) + MOVD R10, 16(RSP) + MOVD R3, 24(RSP) + CALL runtime·memmove(SB) + RET + +// ---------------------------------------------------------------------------- + +// func emitCopy(dst []byte, offset, length int) int +// +// All local variables fit into registers. The register allocation: +// - R3 length +// - R7 &dst[0] +// - R8 &dst[i] +// - R11 offset +// +// The unusual register allocation of local variables, such as R11 for the +// offset, matches the allocation used at the call site in encodeBlock, which +// makes it easier to manually inline this function. +TEXT ·emitCopy(SB), NOSPLIT, $0-48 + MOVD dst_base+0(FP), R8 + MOVD R8, R7 + MOVD offset+24(FP), R11 + MOVD length+32(FP), R3 + +loop0: + // for length >= 68 { etc } + MOVW $68, R2 + CMPW R2, R3 + BLT step1 + + // Emit a length 64 copy, encoded as 3 bytes. + MOVD $0xfe, R2 + MOVB R2, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + SUB $64, R3, R3 + B loop0 + +step1: + // if length > 64 { etc } + MOVD $64, R2 + CMP R2, R3 + BLE step2 + + // Emit a length 60 copy, encoded as 3 bytes. + MOVD $0xee, R2 + MOVB R2, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + SUB $60, R3, R3 + +step2: + // if length >= 12 || offset >= 2048 { goto step3 } + MOVD $12, R2 + CMP R2, R3 + BGE step3 + MOVW $2048, R2 + CMPW R2, R11 + BGE step3 + + // Emit the remaining copy, encoded as 2 bytes. + MOVB R11, 1(R8) + LSRW $3, R11, R11 + AND $0xe0, R11, R11 + SUB $4, R3, R3 + LSLW $2, R3 + AND $0xff, R3, R3 + ORRW R3, R11, R11 + ORRW $1, R11, R11 + MOVB R11, 0(R8) + ADD $2, R8, R8 + + // Return the number of bytes written. + SUB R7, R8, R8 + MOVD R8, ret+40(FP) + RET + +step3: + // Emit the remaining copy, encoded as 3 bytes. + SUB $1, R3, R3 + AND $0xff, R3, R3 + LSLW $2, R3, R3 + ORRW $2, R3, R3 + MOVB R3, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + + // Return the number of bytes written. + SUB R7, R8, R8 + MOVD R8, ret+40(FP) + RET + +// ---------------------------------------------------------------------------- + +// func extendMatch(src []byte, i, j int) int +// +// All local variables fit into registers. The register allocation: +// - R6 &src[0] +// - R7 &src[j] +// - R13 &src[len(src) - 8] +// - R14 &src[len(src)] +// - R15 &src[i] +// +// The unusual register allocation of local variables, such as R15 for a source +// pointer, matches the allocation used at the call site in encodeBlock, which +// makes it easier to manually inline this function. +TEXT ·extendMatch(SB), NOSPLIT, $0-48 + MOVD src_base+0(FP), R6 + MOVD src_len+8(FP), R14 + MOVD i+24(FP), R15 + MOVD j+32(FP), R7 + ADD R6, R14, R14 + ADD R6, R15, R15 + ADD R6, R7, R7 + MOVD R14, R13 + SUB $8, R13, R13 + +cmp8: + // As long as we are 8 or more bytes before the end of src, we can load and + // compare 8 bytes at a time. If those 8 bytes are equal, repeat. + CMP R13, R7 + BHI cmp1 + MOVD (R15), R3 + MOVD (R7), R4 + CMP R4, R3 + BNE bsf + ADD $8, R15, R15 + ADD $8, R7, R7 + B cmp8 + +bsf: + // If those 8 bytes were not equal, XOR the two 8 byte values, and return + // the index of the first byte that differs. + // RBIT reverses the bit order, then CLZ counts the leading zeros, the + // combination of which finds the least significant bit which is set. + // The arm64 architecture is little-endian, and the shift by 3 converts + // a bit index to a byte index. + EOR R3, R4, R4 + RBIT R4, R4 + CLZ R4, R4 + ADD R4>>3, R7, R7 + + // Convert from &src[ret] to ret. + SUB R6, R7, R7 + MOVD R7, ret+40(FP) + RET + +cmp1: + // In src's tail, compare 1 byte at a time. + CMP R7, R14 + BLS extendMatchEnd + MOVB (R15), R3 + MOVB (R7), R4 + CMP R4, R3 + BNE extendMatchEnd + ADD $1, R15, R15 + ADD $1, R7, R7 + B cmp1 + +extendMatchEnd: + // Convert from &src[ret] to ret. + SUB R6, R7, R7 + MOVD R7, ret+40(FP) + RET + +// ---------------------------------------------------------------------------- + +// func encodeBlock(dst, src []byte) (d int) +// +// All local variables fit into registers, other than "var table". The register +// allocation: +// - R3 . . +// - R4 . . +// - R5 64 shift +// - R6 72 &src[0], tableSize +// - R7 80 &src[s] +// - R8 88 &dst[d] +// - R9 96 sLimit +// - R10 . &src[nextEmit] +// - R11 104 prevHash, currHash, nextHash, offset +// - R12 112 &src[base], skip +// - R13 . &src[nextS], &src[len(src) - 8] +// - R14 . len(src), bytesBetweenHashLookups, &src[len(src)], x +// - R15 120 candidate +// - R16 . hash constant, 0x1e35a7bd +// - R17 . &table +// - . 128 table +// +// The second column (64, 72, etc) is the stack offset to spill the registers +// when calling other functions. We could pack this slightly tighter, but it's +// simpler to have a dedicated spill map independent of the function called. +// +// "var table [maxTableSize]uint16" takes up 32768 bytes of stack space. An +// extra 64 bytes, to call other functions, and an extra 64 bytes, to spill +// local variables (registers) during calls gives 32768 + 64 + 64 = 32896. +TEXT ·encodeBlock(SB), 0, $32896-56 + MOVD dst_base+0(FP), R8 + MOVD src_base+24(FP), R7 + MOVD src_len+32(FP), R14 + + // shift, tableSize := uint32(32-8), 1<<8 + MOVD $24, R5 + MOVD $256, R6 + MOVW $0xa7bd, R16 + MOVKW $(0x1e35<<16), R16 + +calcShift: + // for ; tableSize < maxTableSize && tableSize < len(src); tableSize *= 2 { + // shift-- + // } + MOVD $16384, R2 + CMP R2, R6 + BGE varTable + CMP R14, R6 + BGE varTable + SUB $1, R5, R5 + LSL $1, R6, R6 + B calcShift + +varTable: + // var table [maxTableSize]uint16 + // + // In the asm code, unlike the Go code, we can zero-initialize only the + // first tableSize elements. Each uint16 element is 2 bytes and each VST1 + // writes 64 bytes, so we can do only tableSize/32 writes instead of the + // 2048 writes that would zero-initialize all of table's 32768 bytes. + // This clear could overrun the first tableSize elements, but it won't + // overrun the allocated stack size. + ADD $128, RSP, R17 + MOVD R17, R4 + + // !!! R6 = &src[tableSize] + ADD R6<<1, R17, R6 + + // zero the SIMD registers + VEOR V0.B16, V0.B16, V0.B16 + VEOR V1.B16, V1.B16, V1.B16 + VEOR V2.B16, V2.B16, V2.B16 + VEOR V3.B16, V3.B16, V3.B16 + +memclr: + VST1.P [V0.B16, V1.B16, V2.B16, V3.B16], 64(R4) + CMP R4, R6 + BHI memclr + + // !!! R6 = &src[0] + MOVD R7, R6 + + // sLimit := len(src) - inputMargin + MOVD R14, R9 + SUB $15, R9, R9 + + // !!! Pre-emptively spill R5, R6 and R9 to the stack. Their values don't + // change for the rest of the function. + MOVD R5, 64(RSP) + MOVD R6, 72(RSP) + MOVD R9, 96(RSP) + + // nextEmit := 0 + MOVD R6, R10 + + // s := 1 + ADD $1, R7, R7 + + // nextHash := hash(load32(src, s), shift) + MOVW 0(R7), R11 + MULW R16, R11, R11 + LSRW R5, R11, R11 + +outer: + // for { etc } + + // skip := 32 + MOVD $32, R12 + + // nextS := s + MOVD R7, R13 + + // candidate := 0 + MOVD $0, R15 + +inner0: + // for { etc } + + // s := nextS + MOVD R13, R7 + + // bytesBetweenHashLookups := skip >> 5 + MOVD R12, R14 + LSR $5, R14, R14 + + // nextS = s + bytesBetweenHashLookups + ADD R14, R13, R13 + + // skip += bytesBetweenHashLookups + ADD R14, R12, R12 + + // if nextS > sLimit { goto emitRemainder } + MOVD R13, R3 + SUB R6, R3, R3 + CMP R9, R3 + BHI emitRemainder + + // candidate = int(table[nextHash]) + MOVHU 0(R17)(R11<<1), R15 + + // table[nextHash] = uint16(s) + MOVD R7, R3 + SUB R6, R3, R3 + + MOVH R3, 0(R17)(R11<<1) + + // nextHash = hash(load32(src, nextS), shift) + MOVW 0(R13), R11 + MULW R16, R11 + LSRW R5, R11, R11 + + // if load32(src, s) != load32(src, candidate) { continue } break + MOVW 0(R7), R3 + MOVW (R6)(R15*1), R4 + CMPW R4, R3 + BNE inner0 + +fourByteMatch: + // As per the encode_other.go code: + // + // A 4-byte match has been found. We'll later see etc. + + // !!! Jump to a fast path for short (<= 16 byte) literals. See the comment + // on inputMargin in encode.go. + MOVD R7, R3 + SUB R10, R3, R3 + MOVD $16, R2 + CMP R2, R3 + BLE emitLiteralFastPath + + // ---------------------------------------- + // Begin inline of the emitLiteral call. + // + // d += emitLiteral(dst[d:], src[nextEmit:s]) + + MOVW R3, R4 + SUBW $1, R4, R4 + + MOVW $60, R2 + CMPW R2, R4 + BLT inlineEmitLiteralOneByte + MOVW $256, R2 + CMPW R2, R4 + BLT inlineEmitLiteralTwoBytes + +inlineEmitLiteralThreeBytes: + MOVD $0xf4, R1 + MOVB R1, 0(R8) + MOVW R4, 1(R8) + ADD $3, R8, R8 + B inlineEmitLiteralMemmove + +inlineEmitLiteralTwoBytes: + MOVD $0xf0, R1 + MOVB R1, 0(R8) + MOVB R4, 1(R8) + ADD $2, R8, R8 + B inlineEmitLiteralMemmove + +inlineEmitLiteralOneByte: + LSLW $2, R4, R4 + MOVB R4, 0(R8) + ADD $1, R8, R8 + +inlineEmitLiteralMemmove: + // Spill local variables (registers) onto the stack; call; unspill. + // + // copy(dst[i:], lit) + // + // This means calling runtime·memmove(&dst[i], &lit[0], len(lit)), so we push + // R8, R10 and R3 as arguments. + MOVD R8, 8(RSP) + MOVD R10, 16(RSP) + MOVD R3, 24(RSP) + + // Finish the "d +=" part of "d += emitLiteral(etc)". + ADD R3, R8, R8 + MOVD R7, 80(RSP) + MOVD R8, 88(RSP) + MOVD R15, 120(RSP) + CALL runtime·memmove(SB) + MOVD 64(RSP), R5 + MOVD 72(RSP), R6 + MOVD 80(RSP), R7 + MOVD 88(RSP), R8 + MOVD 96(RSP), R9 + MOVD 120(RSP), R15 + B inner1 + +inlineEmitLiteralEnd: + // End inline of the emitLiteral call. + // ---------------------------------------- + +emitLiteralFastPath: + // !!! Emit the 1-byte encoding "uint8(len(lit)-1)<<2". + MOVB R3, R4 + SUBW $1, R4, R4 + AND $0xff, R4, R4 + LSLW $2, R4, R4 + MOVB R4, (R8) + ADD $1, R8, R8 + + // !!! Implement the copy from lit to dst as a 16-byte load and store. + // (Encode's documentation says that dst and src must not overlap.) + // + // This always copies 16 bytes, instead of only len(lit) bytes, but that's + // OK. Subsequent iterations will fix up the overrun. + // + // Note that on arm64, it is legal and cheap to issue unaligned 8-byte or + // 16-byte loads and stores. This technique probably wouldn't be as + // effective on architectures that are fussier about alignment. + VLD1 0(R10), [V0.B16] + VST1 [V0.B16], 0(R8) + ADD R3, R8, R8 + +inner1: + // for { etc } + + // base := s + MOVD R7, R12 + + // !!! offset := base - candidate + MOVD R12, R11 + SUB R15, R11, R11 + SUB R6, R11, R11 + + // ---------------------------------------- + // Begin inline of the extendMatch call. + // + // s = extendMatch(src, candidate+4, s+4) + + // !!! R14 = &src[len(src)] + MOVD src_len+32(FP), R14 + ADD R6, R14, R14 + + // !!! R13 = &src[len(src) - 8] + MOVD R14, R13 + SUB $8, R13, R13 + + // !!! R15 = &src[candidate + 4] + ADD $4, R15, R15 + ADD R6, R15, R15 + + // !!! s += 4 + ADD $4, R7, R7 + +inlineExtendMatchCmp8: + // As long as we are 8 or more bytes before the end of src, we can load and + // compare 8 bytes at a time. If those 8 bytes are equal, repeat. + CMP R13, R7 + BHI inlineExtendMatchCmp1 + MOVD (R15), R3 + MOVD (R7), R4 + CMP R4, R3 + BNE inlineExtendMatchBSF + ADD $8, R15, R15 + ADD $8, R7, R7 + B inlineExtendMatchCmp8 + +inlineExtendMatchBSF: + // If those 8 bytes were not equal, XOR the two 8 byte values, and return + // the index of the first byte that differs. + // RBIT reverses the bit order, then CLZ counts the leading zeros, the + // combination of which finds the least significant bit which is set. + // The arm64 architecture is little-endian, and the shift by 3 converts + // a bit index to a byte index. + EOR R3, R4, R4 + RBIT R4, R4 + CLZ R4, R4 + ADD R4>>3, R7, R7 + B inlineExtendMatchEnd + +inlineExtendMatchCmp1: + // In src's tail, compare 1 byte at a time. + CMP R7, R14 + BLS inlineExtendMatchEnd + MOVB (R15), R3 + MOVB (R7), R4 + CMP R4, R3 + BNE inlineExtendMatchEnd + ADD $1, R15, R15 + ADD $1, R7, R7 + B inlineExtendMatchCmp1 + +inlineExtendMatchEnd: + // End inline of the extendMatch call. + // ---------------------------------------- + + // ---------------------------------------- + // Begin inline of the emitCopy call. + // + // d += emitCopy(dst[d:], base-candidate, s-base) + + // !!! length := s - base + MOVD R7, R3 + SUB R12, R3, R3 + +inlineEmitCopyLoop0: + // for length >= 68 { etc } + MOVW $68, R2 + CMPW R2, R3 + BLT inlineEmitCopyStep1 + + // Emit a length 64 copy, encoded as 3 bytes. + MOVD $0xfe, R1 + MOVB R1, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + SUBW $64, R3, R3 + B inlineEmitCopyLoop0 + +inlineEmitCopyStep1: + // if length > 64 { etc } + MOVW $64, R2 + CMPW R2, R3 + BLE inlineEmitCopyStep2 + + // Emit a length 60 copy, encoded as 3 bytes. + MOVD $0xee, R1 + MOVB R1, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + SUBW $60, R3, R3 + +inlineEmitCopyStep2: + // if length >= 12 || offset >= 2048 { goto inlineEmitCopyStep3 } + MOVW $12, R2 + CMPW R2, R3 + BGE inlineEmitCopyStep3 + MOVW $2048, R2 + CMPW R2, R11 + BGE inlineEmitCopyStep3 + + // Emit the remaining copy, encoded as 2 bytes. + MOVB R11, 1(R8) + LSRW $8, R11, R11 + LSLW $5, R11, R11 + SUBW $4, R3, R3 + AND $0xff, R3, R3 + LSLW $2, R3, R3 + ORRW R3, R11, R11 + ORRW $1, R11, R11 + MOVB R11, 0(R8) + ADD $2, R8, R8 + B inlineEmitCopyEnd + +inlineEmitCopyStep3: + // Emit the remaining copy, encoded as 3 bytes. + SUBW $1, R3, R3 + LSLW $2, R3, R3 + ORRW $2, R3, R3 + MOVB R3, 0(R8) + MOVW R11, 1(R8) + ADD $3, R8, R8 + +inlineEmitCopyEnd: + // End inline of the emitCopy call. + // ---------------------------------------- + + // nextEmit = s + MOVD R7, R10 + + // if s >= sLimit { goto emitRemainder } + MOVD R7, R3 + SUB R6, R3, R3 + CMP R3, R9 + BLS emitRemainder + + // As per the encode_other.go code: + // + // We could immediately etc. + + // x := load64(src, s-1) + MOVD -1(R7), R14 + + // prevHash := hash(uint32(x>>0), shift) + MOVW R14, R11 + MULW R16, R11, R11 + LSRW R5, R11, R11 + + // table[prevHash] = uint16(s-1) + MOVD R7, R3 + SUB R6, R3, R3 + SUB $1, R3, R3 + + MOVHU R3, 0(R17)(R11<<1) + + // currHash := hash(uint32(x>>8), shift) + LSR $8, R14, R14 + MOVW R14, R11 + MULW R16, R11, R11 + LSRW R5, R11, R11 + + // candidate = int(table[currHash]) + MOVHU 0(R17)(R11<<1), R15 + + // table[currHash] = uint16(s) + ADD $1, R3, R3 + MOVHU R3, 0(R17)(R11<<1) + + // if uint32(x>>8) == load32(src, candidate) { continue } + MOVW (R6)(R15*1), R4 + CMPW R4, R14 + BEQ inner1 + + // nextHash = hash(uint32(x>>16), shift) + LSR $8, R14, R14 + MOVW R14, R11 + MULW R16, R11, R11 + LSRW R5, R11, R11 + + // s++ + ADD $1, R7, R7 + + // break out of the inner1 for loop, i.e. continue the outer loop. + B outer + +emitRemainder: + // if nextEmit < len(src) { etc } + MOVD src_len+32(FP), R3 + ADD R6, R3, R3 + CMP R3, R10 + BEQ encodeBlockEnd + + // d += emitLiteral(dst[d:], src[nextEmit:]) + // + // Push args. + MOVD R8, 8(RSP) + MOVD $0, 16(RSP) // Unnecessary, as the callee ignores it, but conservative. + MOVD $0, 24(RSP) // Unnecessary, as the callee ignores it, but conservative. + MOVD R10, 32(RSP) + SUB R10, R3, R3 + MOVD R3, 40(RSP) + MOVD R3, 48(RSP) // Unnecessary, as the callee ignores it, but conservative. + + // Spill local variables (registers) onto the stack; call; unspill. + MOVD R8, 88(RSP) + CALL ·emitLiteral(SB) + MOVD 88(RSP), R8 + + // Finish the "d +=" part of "d += emitLiteral(etc)". + MOVD 56(RSP), R1 + ADD R1, R8, R8 + +encodeBlockEnd: + MOVD dst_base+0(FP), R3 + SUB R3, R8, R8 + MOVD R8, d+48(FP) + RET diff --git a/vendor/github.com/golang/snappy/encode_amd64.go b/vendor/github.com/golang/snappy/encode_asm.go similarity index 97% rename from vendor/github.com/golang/snappy/encode_amd64.go rename to vendor/github.com/golang/snappy/encode_asm.go index 150d91b..107c1e7 100644 --- a/vendor/github.com/golang/snappy/encode_amd64.go +++ b/vendor/github.com/golang/snappy/encode_asm.go @@ -5,6 +5,7 @@ // +build !appengine // +build gc // +build !noasm +// +build amd64 arm64 package snappy diff --git a/vendor/github.com/golang/snappy/encode_other.go b/vendor/github.com/golang/snappy/encode_other.go index dbcae90..296d7f0 100644 --- a/vendor/github.com/golang/snappy/encode_other.go +++ b/vendor/github.com/golang/snappy/encode_other.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !amd64 appengine !gc noasm +// +build !amd64,!arm64 appengine !gc noasm package snappy diff --git a/vendor/github.com/golang/snappy/go.mod b/vendor/github.com/golang/snappy/go.mod new file mode 100644 index 0000000..f6406bb --- /dev/null +++ b/vendor/github.com/golang/snappy/go.mod @@ -0,0 +1 @@ +module github.com/golang/snappy diff --git a/vendor/github.com/hashicorp/go-uuid/.travis.yml b/vendor/github.com/hashicorp/go-uuid/.travis.yml deleted file mode 100644 index 7698490..0000000 --- a/vendor/github.com/hashicorp/go-uuid/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: go - -sudo: false - -go: - - 1.4 - - 1.5 - - 1.6 - - tip - -script: - - go test -bench . -benchmem -v ./... diff --git a/vendor/github.com/hashicorp/go-uuid/LICENSE b/vendor/github.com/hashicorp/go-uuid/LICENSE deleted file mode 100644 index e87a115..0000000 --- a/vendor/github.com/hashicorp/go-uuid/LICENSE +++ /dev/null @@ -1,363 +0,0 @@ -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. "Contributor" - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. "Contributor Version" - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. - -1.6. "Executable Form" - - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. - -1.8. "License" - - means this document. - -1.9. "Licensable" - - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. - -1.10. "Modifications" - - means any of the following: - - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or - - b. any new file in Source Code Form that contains any Covered Software. - -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. - -1.12. "Secondary License" - - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - -1.13. "Source Code Form" - - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - -2. License Grants and Conditions - -2.1. Grants - - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. - -2.3. Limitations on Grant Scope - - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: - - a. for any code that a Contributor has removed from Covered Software; or - - b. for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. - - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). - -2.5. Representation - - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. - -2.7. Conditions - - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - - -3. Responsibilities - -3.1. Distribution of Source Form - - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. - -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice - - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by - the Mozilla Public License, v. 2.0. - diff --git a/vendor/github.com/hashicorp/go-uuid/README.md b/vendor/github.com/hashicorp/go-uuid/README.md deleted file mode 100644 index fbde8b9..0000000 --- a/vendor/github.com/hashicorp/go-uuid/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# uuid [![Build Status](https://travis-ci.org/hashicorp/go-uuid.svg?branch=master)](https://travis-ci.org/hashicorp/go-uuid) - -Generates UUID-format strings using high quality, _purely random_ bytes. It is **not** intended to be RFC compliant, merely to use a well-understood string representation of a 128-bit value. It can also parse UUID-format strings into their component bytes. - -Documentation -============= - -The full documentation is available on [Godoc](http://godoc.org/github.com/hashicorp/go-uuid). diff --git a/vendor/github.com/hashicorp/go-uuid/go.mod b/vendor/github.com/hashicorp/go-uuid/go.mod deleted file mode 100644 index dd57f9d..0000000 --- a/vendor/github.com/hashicorp/go-uuid/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/hashicorp/go-uuid diff --git a/vendor/github.com/hashicorp/go-uuid/uuid.go b/vendor/github.com/hashicorp/go-uuid/uuid.go deleted file mode 100644 index 0c10c4e..0000000 --- a/vendor/github.com/hashicorp/go-uuid/uuid.go +++ /dev/null @@ -1,83 +0,0 @@ -package uuid - -import ( - "crypto/rand" - "encoding/hex" - "fmt" - "io" -) - -// GenerateRandomBytes is used to generate random bytes of given size. -func GenerateRandomBytes(size int) ([]byte, error) { - return GenerateRandomBytesWithReader(size, rand.Reader) -} - -// GenerateRandomBytesWithReader is used to generate random bytes of given size read from a given reader. -func GenerateRandomBytesWithReader(size int, reader io.Reader) ([]byte, error) { - if reader == nil { - return nil, fmt.Errorf("provided reader is nil") - } - buf := make([]byte, size) - if _, err := io.ReadFull(reader, buf); err != nil { - return nil, fmt.Errorf("failed to read random bytes: %v", err) - } - return buf, nil -} - - -const uuidLen = 16 - -// GenerateUUID is used to generate a random UUID -func GenerateUUID() (string, error) { - return GenerateUUIDWithReader(rand.Reader) -} - -// GenerateUUIDWithReader is used to generate a random UUID with a given Reader -func GenerateUUIDWithReader(reader io.Reader) (string, error) { - if reader == nil { - return "", fmt.Errorf("provided reader is nil") - } - buf, err := GenerateRandomBytesWithReader(uuidLen, reader) - if err != nil { - return "", err - } - return FormatUUID(buf) -} - -func FormatUUID(buf []byte) (string, error) { - if buflen := len(buf); buflen != uuidLen { - return "", fmt.Errorf("wrong length byte slice (%d)", buflen) - } - - return fmt.Sprintf("%x-%x-%x-%x-%x", - buf[0:4], - buf[4:6], - buf[6:8], - buf[8:10], - buf[10:16]), nil -} - -func ParseUUID(uuid string) ([]byte, error) { - if len(uuid) != 2 * uuidLen + 4 { - return nil, fmt.Errorf("uuid string is wrong length") - } - - if uuid[8] != '-' || - uuid[13] != '-' || - uuid[18] != '-' || - uuid[23] != '-' { - return nil, fmt.Errorf("uuid is improperly formatted") - } - - hexStr := uuid[0:8] + uuid[9:13] + uuid[14:18] + uuid[19:23] + uuid[24:36] - - ret, err := hex.DecodeString(hexStr) - if err != nil { - return nil, err - } - if len(ret) != uuidLen { - return nil, fmt.Errorf("decoded hex is the wrong length") - } - - return ret, nil -} diff --git a/vendor/github.com/jcmturner/aescts/v2/LICENSE b/vendor/github.com/jcmturner/aescts/v2/LICENSE deleted file mode 100644 index 8dada3e..0000000 --- a/vendor/github.com/jcmturner/aescts/v2/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/jcmturner/aescts/v2/aescts.go b/vendor/github.com/jcmturner/aescts/v2/aescts.go deleted file mode 100644 index fee3b43..0000000 --- a/vendor/github.com/jcmturner/aescts/v2/aescts.go +++ /dev/null @@ -1,186 +0,0 @@ -// Package aescts provides AES CBC CipherText Stealing encryption and decryption methods -package aescts - -import ( - "crypto/aes" - "crypto/cipher" - "errors" - "fmt" -) - -// Encrypt the message with the key and the initial vector. -// Returns: next iv, ciphertext bytes, error -func Encrypt(key, iv, plaintext []byte) ([]byte, []byte, error) { - l := len(plaintext) - - block, err := aes.NewCipher(key) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("error creating cipher: %v", err) - } - mode := cipher.NewCBCEncrypter(block, iv) - - m := make([]byte, len(plaintext)) - copy(m, plaintext) - - /*For consistency, ciphertext stealing is always used for the last two - blocks of the data to be encrypted, as in [RC5]. If the data length - is a multiple of the block size, this is equivalent to plain CBC mode - with the last two ciphertext blocks swapped.*/ - /*The initial vector carried out from one encryption for use in a - subsequent encryption is the next-to-last block of the encryption - output; this is the encrypted form of the last plaintext block.*/ - if l <= aes.BlockSize { - m, _ = zeroPad(m, aes.BlockSize) - mode.CryptBlocks(m, m) - return m, m, nil - } - if l%aes.BlockSize == 0 { - mode.CryptBlocks(m, m) - iv = m[len(m)-aes.BlockSize:] - rb, _ := swapLastTwoBlocks(m, aes.BlockSize) - return iv, rb, nil - } - m, _ = zeroPad(m, aes.BlockSize) - rb, pb, lb, err := tailBlocks(m, aes.BlockSize) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("error tailing blocks: %v", err) - } - var ct []byte - if rb != nil { - // Encrpt all but the lats 2 blocks and update the rolling iv - mode.CryptBlocks(rb, rb) - iv = rb[len(rb)-aes.BlockSize:] - mode = cipher.NewCBCEncrypter(block, iv) - ct = append(ct, rb...) - } - mode.CryptBlocks(pb, pb) - mode = cipher.NewCBCEncrypter(block, pb) - mode.CryptBlocks(lb, lb) - // Cipher Text Stealing (CTS) - Ref: https://en.wikipedia.org/wiki/Ciphertext_stealing#CBC_ciphertext_stealing - // Swap the last two cipher blocks - // Truncate the ciphertext to the length of the original plaintext - ct = append(ct, lb...) - ct = append(ct, pb...) - return lb, ct[:l], nil -} - -// Decrypt the ciphertext with the key and the initial vector. -func Decrypt(key, iv, ciphertext []byte) ([]byte, error) { - // Copy the cipher text as golang slices even when passed by value to this method can result in the backing arrays of the calling code value being updated. - ct := make([]byte, len(ciphertext)) - copy(ct, ciphertext) - if len(ct) < aes.BlockSize { - return []byte{}, fmt.Errorf("ciphertext is not large enough. It is less that one block size. Blocksize:%v; Ciphertext:%v", aes.BlockSize, len(ct)) - } - // Configure the CBC - block, err := aes.NewCipher(key) - if err != nil { - return nil, fmt.Errorf("error creating cipher: %v", err) - } - var mode cipher.BlockMode - - //If ciphertext is multiple of blocksize we just need to swap back the last two blocks and then do CBC - //If the ciphertext is just one block we can't swap so we just decrypt - if len(ct)%aes.BlockSize == 0 { - if len(ct) > aes.BlockSize { - ct, _ = swapLastTwoBlocks(ct, aes.BlockSize) - } - mode = cipher.NewCBCDecrypter(block, iv) - message := make([]byte, len(ct)) - mode.CryptBlocks(message, ct) - return message[:len(ct)], nil - } - - // Cipher Text Stealing (CTS) using CBC interface. Ref: https://en.wikipedia.org/wiki/Ciphertext_stealing#CBC_ciphertext_stealing - // Get ciphertext of the 2nd to last (penultimate) block (cpb), the last block (clb) and the rest (crb) - crb, cpb, clb, _ := tailBlocks(ct, aes.BlockSize) - v := make([]byte, len(iv), len(iv)) - copy(v, iv) - var message []byte - if crb != nil { - //If there is more than just the last and the penultimate block we decrypt it and the last bloc of this becomes the iv for later - rb := make([]byte, len(crb)) - mode = cipher.NewCBCDecrypter(block, v) - v = crb[len(crb)-aes.BlockSize:] - mode.CryptBlocks(rb, crb) - message = append(message, rb...) - } - - // We need to modify the cipher text - // Decryt the 2nd to last (penultimate) block with a the original iv - pb := make([]byte, aes.BlockSize) - mode = cipher.NewCBCDecrypter(block, iv) - mode.CryptBlocks(pb, cpb) - // number of byte needed to pad - npb := aes.BlockSize - len(ct)%aes.BlockSize - //pad last block using the number of bytes needed from the tail of the plaintext 2nd to last (penultimate) block - clb = append(clb, pb[len(pb)-npb:]...) - - // Now decrypt the last block in the penultimate position (iv will be from the crb, if the is no crb it's zeros) - // iv for the penultimate block decrypted in the last position becomes the modified last block - lb := make([]byte, aes.BlockSize) - mode = cipher.NewCBCDecrypter(block, v) - v = clb - mode.CryptBlocks(lb, clb) - message = append(message, lb...) - - // Now decrypt the penultimate block in the last position (iv will be from the modified last block) - mode = cipher.NewCBCDecrypter(block, v) - mode.CryptBlocks(cpb, cpb) - message = append(message, cpb...) - - // Truncate to the size of the original cipher text - return message[:len(ct)], nil -} - -func tailBlocks(b []byte, c int) ([]byte, []byte, []byte, error) { - if len(b) <= c { - return []byte{}, []byte{}, []byte{}, errors.New("bytes slice is not larger than one block so cannot tail") - } - // Get size of last block - var lbs int - if l := len(b) % aes.BlockSize; l == 0 { - lbs = aes.BlockSize - } else { - lbs = l - } - // Get last block - lb := b[len(b)-lbs:] - // Get 2nd to last (penultimate) block - pb := b[len(b)-lbs-c : len(b)-lbs] - if len(b) > 2*c { - rb := b[:len(b)-lbs-c] - return rb, pb, lb, nil - } - return nil, pb, lb, nil -} - -func swapLastTwoBlocks(b []byte, c int) ([]byte, error) { - rb, pb, lb, err := tailBlocks(b, c) - if err != nil { - return nil, err - } - var out []byte - if rb != nil { - out = append(out, rb...) - } - out = append(out, lb...) - out = append(out, pb...) - return out, nil -} - -// zeroPad pads bytes with zeros to nearest multiple of message size m. -func zeroPad(b []byte, m int) ([]byte, error) { - if m <= 0 { - return nil, errors.New("invalid message block size when padding") - } - if b == nil || len(b) == 0 { - return nil, errors.New("data not valid to pad: Zero size") - } - if l := len(b) % m; l != 0 { - n := m - l - z := make([]byte, n) - b = append(b, z...) - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/aescts/v2/go.mod b/vendor/github.com/jcmturner/aescts/v2/go.mod deleted file mode 100644 index 034c3ce..0000000 --- a/vendor/github.com/jcmturner/aescts/v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/jcmturner/aescts/v2 - -go 1.13 - -require github.com/stretchr/testify v1.4.0 diff --git a/vendor/github.com/jcmturner/aescts/v2/go.sum b/vendor/github.com/jcmturner/aescts/v2/go.sum deleted file mode 100644 index e863f51..0000000 --- a/vendor/github.com/jcmturner/aescts/v2/go.sum +++ /dev/null @@ -1,10 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/jcmturner/dnsutils/v2/LICENSE b/vendor/github.com/jcmturner/dnsutils/v2/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/vendor/github.com/jcmturner/dnsutils/v2/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/jcmturner/dnsutils/v2/go.mod b/vendor/github.com/jcmturner/dnsutils/v2/go.mod deleted file mode 100644 index f75ac6d..0000000 --- a/vendor/github.com/jcmturner/dnsutils/v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/jcmturner/dnsutils/v2 - -go 1.13 - -require github.com/stretchr/testify v1.4.0 diff --git a/vendor/github.com/jcmturner/dnsutils/v2/go.sum b/vendor/github.com/jcmturner/dnsutils/v2/go.sum deleted file mode 100644 index e863f51..0000000 --- a/vendor/github.com/jcmturner/dnsutils/v2/go.sum +++ /dev/null @@ -1,10 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/jcmturner/dnsutils/v2/srv.go b/vendor/github.com/jcmturner/dnsutils/v2/srv.go deleted file mode 100644 index 15ea912..0000000 --- a/vendor/github.com/jcmturner/dnsutils/v2/srv.go +++ /dev/null @@ -1,95 +0,0 @@ -package dnsutils - -import ( - "math/rand" - "net" - "sort" -) - -// OrderedSRV returns a count of the results and a map keyed on the order they should be used. -// This based on the records' priority and randomised selection based on their relative weighting. -// The function's inputs are the same as those for net.LookupSRV -// To use in the correct order: -// -// count, orderedSRV, err := OrderedSRV(service, proto, name) -// i := 1 -// for i <= count { -// srv := orderedSRV[i] -// // Do something such as dial this SRV. If fails move on the the next or break if it succeeds. -// i += 1 -// } -func OrderedSRV(service, proto, name string) (int, map[int]*net.SRV, error) { - _, addrs, err := net.LookupSRV(service, proto, name) - if err != nil { - return 0, make(map[int]*net.SRV), err - } - index, osrv := orderSRV(addrs) - return index, osrv, nil -} - -func orderSRV(addrs []*net.SRV) (int, map[int]*net.SRV) { - // Initialise the ordered map - var o int - osrv := make(map[int]*net.SRV) - - prioMap := make(map[int][]*net.SRV, 0) - for _, srv := range addrs { - prioMap[int(srv.Priority)] = append(prioMap[int(srv.Priority)], srv) - } - - priorities := make([]int, 0) - for p := range prioMap { - priorities = append(priorities, p) - } - - var count int - sort.Ints(priorities) - for _, p := range priorities { - tos := weightedOrder(prioMap[p]) - for i, s := range tos { - count += 1 - osrv[o+i] = s - } - o += len(tos) - } - return count, osrv -} - -func weightedOrder(srvs []*net.SRV) map[int]*net.SRV { - // Get the total weight - var tw int - for _, s := range srvs { - tw += int(s.Weight) - } - - // Initialise the ordered map - o := 1 - osrv := make(map[int]*net.SRV) - - // Whilst there are still entries to be ordered - l := len(srvs) - for l > 0 { - i := rand.Intn(l) - s := srvs[i] - var rw int - if tw > 0 { - // Greater the weight the more likely this will be zero or less - rw = rand.Intn(tw) - int(s.Weight) - } - if rw <= 0 { - // Put entry in position - osrv[o] = s - if len(srvs) > 1 { - // Remove the entry from the source slice by swapping with the last entry and truncating - srvs[len(srvs)-1], srvs[i] = srvs[i], srvs[len(srvs)-1] - srvs = srvs[:len(srvs)-1] - l = len(srvs) - } else { - l = 0 - } - o += 1 - tw = tw - int(s.Weight) - } - } - return osrv -} diff --git a/vendor/github.com/jcmturner/gofork/LICENSE b/vendor/github.com/jcmturner/gofork/LICENSE deleted file mode 100644 index 6a66aea..0000000 --- a/vendor/github.com/jcmturner/gofork/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/jcmturner/gofork/encoding/asn1/README.md b/vendor/github.com/jcmturner/gofork/encoding/asn1/README.md deleted file mode 100644 index 66a2a8c..0000000 --- a/vendor/github.com/jcmturner/gofork/encoding/asn1/README.md +++ /dev/null @@ -1,5 +0,0 @@ -This is a temporary repository that will be removed when the issues below are fixed in the core golang code. - -## Issues -* [encoding/asn1: cannot marshal into a GeneralString](https://github.com/golang/go/issues/18832) -* [encoding/asn1: cannot marshal into slice of strings and pass stringtype parameter tags to members](https://github.com/golang/go/issues/18834) \ No newline at end of file diff --git a/vendor/github.com/jcmturner/gofork/encoding/asn1/asn1.go b/vendor/github.com/jcmturner/gofork/encoding/asn1/asn1.go deleted file mode 100644 index f1bb767..0000000 --- a/vendor/github.com/jcmturner/gofork/encoding/asn1/asn1.go +++ /dev/null @@ -1,1003 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package asn1 implements parsing of DER-encoded ASN.1 data structures, -// as defined in ITU-T Rec X.690. -// -// See also ``A Layman's Guide to a Subset of ASN.1, BER, and DER,'' -// http://luca.ntop.org/Teaching/Appunti/asn1.html. -package asn1 - -// ASN.1 is a syntax for specifying abstract objects and BER, DER, PER, XER etc -// are different encoding formats for those objects. Here, we'll be dealing -// with DER, the Distinguished Encoding Rules. DER is used in X.509 because -// it's fast to parse and, unlike BER, has a unique encoding for every object. -// When calculating hashes over objects, it's important that the resulting -// bytes be the same at both ends and DER removes this margin of error. -// -// ASN.1 is very complex and this package doesn't attempt to implement -// everything by any means. - -import ( - "errors" - "fmt" - "math/big" - "reflect" - "strconv" - "time" - "unicode/utf8" -) - -// A StructuralError suggests that the ASN.1 data is valid, but the Go type -// which is receiving it doesn't match. -type StructuralError struct { - Msg string -} - -func (e StructuralError) Error() string { return "asn1: structure error: " + e.Msg } - -// A SyntaxError suggests that the ASN.1 data is invalid. -type SyntaxError struct { - Msg string -} - -func (e SyntaxError) Error() string { return "asn1: syntax error: " + e.Msg } - -// We start by dealing with each of the primitive types in turn. - -// BOOLEAN - -func parseBool(bytes []byte) (ret bool, err error) { - if len(bytes) != 1 { - err = SyntaxError{"invalid boolean"} - return - } - - // DER demands that "If the encoding represents the boolean value TRUE, - // its single contents octet shall have all eight bits set to one." - // Thus only 0 and 255 are valid encoded values. - switch bytes[0] { - case 0: - ret = false - case 0xff: - ret = true - default: - err = SyntaxError{"invalid boolean"} - } - - return -} - -// INTEGER - -// checkInteger returns nil if the given bytes are a valid DER-encoded -// INTEGER and an error otherwise. -func checkInteger(bytes []byte) error { - if len(bytes) == 0 { - return StructuralError{"empty integer"} - } - if len(bytes) == 1 { - return nil - } - if (bytes[0] == 0 && bytes[1]&0x80 == 0) || (bytes[0] == 0xff && bytes[1]&0x80 == 0x80) { - return StructuralError{"integer not minimally-encoded"} - } - return nil -} - -// parseInt64 treats the given bytes as a big-endian, signed integer and -// returns the result. -func parseInt64(bytes []byte) (ret int64, err error) { - err = checkInteger(bytes) - if err != nil { - return - } - if len(bytes) > 8 { - // We'll overflow an int64 in this case. - err = StructuralError{"integer too large"} - return - } - for bytesRead := 0; bytesRead < len(bytes); bytesRead++ { - ret <<= 8 - ret |= int64(bytes[bytesRead]) - } - - // Shift up and down in order to sign extend the result. - ret <<= 64 - uint8(len(bytes))*8 - ret >>= 64 - uint8(len(bytes))*8 - return -} - -// parseInt treats the given bytes as a big-endian, signed integer and returns -// the result. -func parseInt32(bytes []byte) (int32, error) { - if err := checkInteger(bytes); err != nil { - return 0, err - } - ret64, err := parseInt64(bytes) - if err != nil { - return 0, err - } - if ret64 != int64(int32(ret64)) { - return 0, StructuralError{"integer too large"} - } - return int32(ret64), nil -} - -var bigOne = big.NewInt(1) - -// parseBigInt treats the given bytes as a big-endian, signed integer and returns -// the result. -func parseBigInt(bytes []byte) (*big.Int, error) { - if err := checkInteger(bytes); err != nil { - return nil, err - } - ret := new(big.Int) - if len(bytes) > 0 && bytes[0]&0x80 == 0x80 { - // This is a negative number. - notBytes := make([]byte, len(bytes)) - for i := range notBytes { - notBytes[i] = ^bytes[i] - } - ret.SetBytes(notBytes) - ret.Add(ret, bigOne) - ret.Neg(ret) - return ret, nil - } - ret.SetBytes(bytes) - return ret, nil -} - -// BIT STRING - -// BitString is the structure to use when you want an ASN.1 BIT STRING type. A -// bit string is padded up to the nearest byte in memory and the number of -// valid bits is recorded. Padding bits will be zero. -type BitString struct { - Bytes []byte // bits packed into bytes. - BitLength int // length in bits. -} - -// At returns the bit at the given index. If the index is out of range it -// returns false. -func (b BitString) At(i int) int { - if i < 0 || i >= b.BitLength { - return 0 - } - x := i / 8 - y := 7 - uint(i%8) - return int(b.Bytes[x]>>y) & 1 -} - -// RightAlign returns a slice where the padding bits are at the beginning. The -// slice may share memory with the BitString. -func (b BitString) RightAlign() []byte { - shift := uint(8 - (b.BitLength % 8)) - if shift == 8 || len(b.Bytes) == 0 { - return b.Bytes - } - - a := make([]byte, len(b.Bytes)) - a[0] = b.Bytes[0] >> shift - for i := 1; i < len(b.Bytes); i++ { - a[i] = b.Bytes[i-1] << (8 - shift) - a[i] |= b.Bytes[i] >> shift - } - - return a -} - -// parseBitString parses an ASN.1 bit string from the given byte slice and returns it. -func parseBitString(bytes []byte) (ret BitString, err error) { - if len(bytes) == 0 { - err = SyntaxError{"zero length BIT STRING"} - return - } - paddingBits := int(bytes[0]) - if paddingBits > 7 || - len(bytes) == 1 && paddingBits > 0 || - bytes[len(bytes)-1]&((1< 0 { - s += "." - } - s += strconv.Itoa(v) - } - - return s -} - -// parseObjectIdentifier parses an OBJECT IDENTIFIER from the given bytes and -// returns it. An object identifier is a sequence of variable length integers -// that are assigned in a hierarchy. -func parseObjectIdentifier(bytes []byte) (s []int, err error) { - if len(bytes) == 0 { - err = SyntaxError{"zero length OBJECT IDENTIFIER"} - return - } - - // In the worst case, we get two elements from the first byte (which is - // encoded differently) and then every varint is a single byte long. - s = make([]int, len(bytes)+1) - - // The first varint is 40*value1 + value2: - // According to this packing, value1 can take the values 0, 1 and 2 only. - // When value1 = 0 or value1 = 1, then value2 is <= 39. When value1 = 2, - // then there are no restrictions on value2. - v, offset, err := parseBase128Int(bytes, 0) - if err != nil { - return - } - if v < 80 { - s[0] = v / 40 - s[1] = v % 40 - } else { - s[0] = 2 - s[1] = v - 80 - } - - i := 2 - for ; offset < len(bytes); i++ { - v, offset, err = parseBase128Int(bytes, offset) - if err != nil { - return - } - s[i] = v - } - s = s[0:i] - return -} - -// ENUMERATED - -// An Enumerated is represented as a plain int. -type Enumerated int - -// FLAG - -// A Flag accepts any data and is set to true if present. -type Flag bool - -// parseBase128Int parses a base-128 encoded int from the given offset in the -// given byte slice. It returns the value and the new offset. -func parseBase128Int(bytes []byte, initOffset int) (ret, offset int, err error) { - offset = initOffset - for shifted := 0; offset < len(bytes); shifted++ { - if shifted == 4 { - err = StructuralError{"base 128 integer too large"} - return - } - ret <<= 7 - b := bytes[offset] - ret |= int(b & 0x7f) - offset++ - if b&0x80 == 0 { - return - } - } - err = SyntaxError{"truncated base 128 integer"} - return -} - -// UTCTime - -func parseUTCTime(bytes []byte) (ret time.Time, err error) { - s := string(bytes) - - formatStr := "0601021504Z0700" - ret, err = time.Parse(formatStr, s) - if err != nil { - formatStr = "060102150405Z0700" - ret, err = time.Parse(formatStr, s) - } - if err != nil { - return - } - - if serialized := ret.Format(formatStr); serialized != s { - err = fmt.Errorf("asn1: time did not serialize back to the original value and may be invalid: given %q, but serialized as %q", s, serialized) - return - } - - if ret.Year() >= 2050 { - // UTCTime only encodes times prior to 2050. See https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1 - ret = ret.AddDate(-100, 0, 0) - } - - return -} - -// parseGeneralizedTime parses the GeneralizedTime from the given byte slice -// and returns the resulting time. -func parseGeneralizedTime(bytes []byte) (ret time.Time, err error) { - const formatStr = "20060102150405Z0700" - s := string(bytes) - - if ret, err = time.Parse(formatStr, s); err != nil { - return - } - - if serialized := ret.Format(formatStr); serialized != s { - err = fmt.Errorf("asn1: time did not serialize back to the original value and may be invalid: given %q, but serialized as %q", s, serialized) - } - - return -} - -// PrintableString - -// parsePrintableString parses a ASN.1 PrintableString from the given byte -// array and returns it. -func parsePrintableString(bytes []byte) (ret string, err error) { - for _, b := range bytes { - if !isPrintable(b) { - err = SyntaxError{"PrintableString contains invalid character"} - return - } - } - ret = string(bytes) - return -} - -// isPrintable reports whether the given b is in the ASN.1 PrintableString set. -func isPrintable(b byte) bool { - return 'a' <= b && b <= 'z' || - 'A' <= b && b <= 'Z' || - '0' <= b && b <= '9' || - '\'' <= b && b <= ')' || - '+' <= b && b <= '/' || - b == ' ' || - b == ':' || - b == '=' || - b == '?' || - // This is technically not allowed in a PrintableString. - // However, x509 certificates with wildcard strings don't - // always use the correct string type so we permit it. - b == '*' -} - -// IA5String - -// parseIA5String parses a ASN.1 IA5String (ASCII string) from the given -// byte slice and returns it. -func parseIA5String(bytes []byte) (ret string, err error) { - for _, b := range bytes { - if b >= utf8.RuneSelf { - err = SyntaxError{"IA5String contains invalid character"} - return - } - } - ret = string(bytes) - return -} - -// T61String - -// parseT61String parses a ASN.1 T61String (8-bit clean string) from the given -// byte slice and returns it. -func parseT61String(bytes []byte) (ret string, err error) { - return string(bytes), nil -} - -// UTF8String - -// parseUTF8String parses a ASN.1 UTF8String (raw UTF-8) from the given byte -// array and returns it. -func parseUTF8String(bytes []byte) (ret string, err error) { - if !utf8.Valid(bytes) { - return "", errors.New("asn1: invalid UTF-8 string") - } - return string(bytes), nil -} - -// A RawValue represents an undecoded ASN.1 object. -type RawValue struct { - Class, Tag int - IsCompound bool - Bytes []byte - FullBytes []byte // includes the tag and length -} - -// RawContent is used to signal that the undecoded, DER data needs to be -// preserved for a struct. To use it, the first field of the struct must have -// this type. It's an error for any of the other fields to have this type. -type RawContent []byte - -// Tagging - -// parseTagAndLength parses an ASN.1 tag and length pair from the given offset -// into a byte slice. It returns the parsed data and the new offset. SET and -// SET OF (tag 17) are mapped to SEQUENCE and SEQUENCE OF (tag 16) since we -// don't distinguish between ordered and unordered objects in this code. -func parseTagAndLength(bytes []byte, initOffset int) (ret tagAndLength, offset int, err error) { - offset = initOffset - // parseTagAndLength should not be called without at least a single - // byte to read. Thus this check is for robustness: - if offset >= len(bytes) { - err = errors.New("asn1: internal error in parseTagAndLength") - return - } - b := bytes[offset] - offset++ - ret.class = int(b >> 6) - ret.isCompound = b&0x20 == 0x20 - ret.tag = int(b & 0x1f) - - // If the bottom five bits are set, then the tag number is actually base 128 - // encoded afterwards - if ret.tag == 0x1f { - ret.tag, offset, err = parseBase128Int(bytes, offset) - if err != nil { - return - } - // Tags should be encoded in minimal form. - if ret.tag < 0x1f { - err = SyntaxError{"non-minimal tag"} - return - } - } - if offset >= len(bytes) { - err = SyntaxError{"truncated tag or length"} - return - } - b = bytes[offset] - offset++ - if b&0x80 == 0 { - // The length is encoded in the bottom 7 bits. - ret.length = int(b & 0x7f) - } else { - // Bottom 7 bits give the number of length bytes to follow. - numBytes := int(b & 0x7f) - if numBytes == 0 { - err = SyntaxError{"indefinite length found (not DER)"} - return - } - ret.length = 0 - for i := 0; i < numBytes; i++ { - if offset >= len(bytes) { - err = SyntaxError{"truncated tag or length"} - return - } - b = bytes[offset] - offset++ - if ret.length >= 1<<23 { - // We can't shift ret.length up without - // overflowing. - err = StructuralError{"length too large"} - return - } - ret.length <<= 8 - ret.length |= int(b) - if ret.length == 0 { - // DER requires that lengths be minimal. - err = StructuralError{"superfluous leading zeros in length"} - return - } - } - // Short lengths must be encoded in short form. - if ret.length < 0x80 { - err = StructuralError{"non-minimal length"} - return - } - } - - return -} - -// parseSequenceOf is used for SEQUENCE OF and SET OF values. It tries to parse -// a number of ASN.1 values from the given byte slice and returns them as a -// slice of Go values of the given type. -func parseSequenceOf(bytes []byte, sliceType reflect.Type, elemType reflect.Type) (ret reflect.Value, err error) { - expectedTag, compoundType, ok := getUniversalType(elemType) - if !ok { - err = StructuralError{"unknown Go type for slice"} - return - } - - // First we iterate over the input and count the number of elements, - // checking that the types are correct in each case. - numElements := 0 - for offset := 0; offset < len(bytes); { - var t tagAndLength - t, offset, err = parseTagAndLength(bytes, offset) - if err != nil { - return - } - switch t.tag { - case TagIA5String, TagGeneralString, TagT61String, TagUTF8String: - // We pretend that various other string types are - // PRINTABLE STRINGs so that a sequence of them can be - // parsed into a []string. - t.tag = TagPrintableString - case TagGeneralizedTime, TagUTCTime: - // Likewise, both time types are treated the same. - t.tag = TagUTCTime - } - - if t.class != ClassUniversal || t.isCompound != compoundType || t.tag != expectedTag { - err = StructuralError{"sequence tag mismatch"} - return - } - if invalidLength(offset, t.length, len(bytes)) { - err = SyntaxError{"truncated sequence"} - return - } - offset += t.length - numElements++ - } - ret = reflect.MakeSlice(sliceType, numElements, numElements) - params := fieldParameters{} - offset := 0 - for i := 0; i < numElements; i++ { - offset, err = parseField(ret.Index(i), bytes, offset, params) - if err != nil { - return - } - } - return -} - -var ( - bitStringType = reflect.TypeOf(BitString{}) - objectIdentifierType = reflect.TypeOf(ObjectIdentifier{}) - enumeratedType = reflect.TypeOf(Enumerated(0)) - flagType = reflect.TypeOf(Flag(false)) - timeType = reflect.TypeOf(time.Time{}) - rawValueType = reflect.TypeOf(RawValue{}) - rawContentsType = reflect.TypeOf(RawContent(nil)) - bigIntType = reflect.TypeOf(new(big.Int)) -) - -// invalidLength returns true iff offset + length > sliceLength, or if the -// addition would overflow. -func invalidLength(offset, length, sliceLength int) bool { - return offset+length < offset || offset+length > sliceLength -} - -// parseField is the main parsing function. Given a byte slice and an offset -// into the array, it will try to parse a suitable ASN.1 value out and store it -// in the given Value. -func parseField(v reflect.Value, bytes []byte, initOffset int, params fieldParameters) (offset int, err error) { - offset = initOffset - fieldType := v.Type() - - // If we have run out of data, it may be that there are optional elements at the end. - if offset == len(bytes) { - if !setDefaultValue(v, params) { - err = SyntaxError{"sequence truncated"} - } - return - } - - // Deal with raw values. - if fieldType == rawValueType { - var t tagAndLength - t, offset, err = parseTagAndLength(bytes, offset) - if err != nil { - return - } - if invalidLength(offset, t.length, len(bytes)) { - err = SyntaxError{"data truncated"} - return - } - result := RawValue{t.class, t.tag, t.isCompound, bytes[offset : offset+t.length], bytes[initOffset : offset+t.length]} - offset += t.length - v.Set(reflect.ValueOf(result)) - return - } - - // Deal with the ANY type. - if ifaceType := fieldType; ifaceType.Kind() == reflect.Interface && ifaceType.NumMethod() == 0 { - var t tagAndLength - t, offset, err = parseTagAndLength(bytes, offset) - if err != nil { - return - } - if invalidLength(offset, t.length, len(bytes)) { - err = SyntaxError{"data truncated"} - return - } - var result interface{} - if !t.isCompound && t.class == ClassUniversal { - innerBytes := bytes[offset : offset+t.length] - switch t.tag { - case TagPrintableString: - result, err = parsePrintableString(innerBytes) - case TagIA5String: - result, err = parseIA5String(innerBytes) - // jtasn1 addition of following case - case TagGeneralString: - result, err = parseIA5String(innerBytes) - case TagT61String: - result, err = parseT61String(innerBytes) - case TagUTF8String: - result, err = parseUTF8String(innerBytes) - case TagInteger: - result, err = parseInt64(innerBytes) - case TagBitString: - result, err = parseBitString(innerBytes) - case TagOID: - result, err = parseObjectIdentifier(innerBytes) - case TagUTCTime: - result, err = parseUTCTime(innerBytes) - case TagGeneralizedTime: - result, err = parseGeneralizedTime(innerBytes) - case TagOctetString: - result = innerBytes - default: - // If we don't know how to handle the type, we just leave Value as nil. - } - } - offset += t.length - if err != nil { - return - } - if result != nil { - v.Set(reflect.ValueOf(result)) - } - return - } - universalTag, compoundType, ok1 := getUniversalType(fieldType) - if !ok1 { - err = StructuralError{fmt.Sprintf("unknown Go type: %v", fieldType)} - return - } - - t, offset, err := parseTagAndLength(bytes, offset) - if err != nil { - return - } - if params.explicit { - expectedClass := ClassContextSpecific - if params.application { - expectedClass = ClassApplication - } - if offset == len(bytes) { - err = StructuralError{"explicit tag has no child"} - return - } - if t.class == expectedClass && t.tag == *params.tag && (t.length == 0 || t.isCompound) { - if t.length > 0 { - t, offset, err = parseTagAndLength(bytes, offset) - if err != nil { - return - } - } else { - if fieldType != flagType { - err = StructuralError{"zero length explicit tag was not an asn1.Flag"} - return - } - v.SetBool(true) - return - } - } else { - // The tags didn't match, it might be an optional element. - ok := setDefaultValue(v, params) - if ok { - offset = initOffset - } else { - err = StructuralError{"explicitly tagged member didn't match"} - } - return - } - } - - // Special case for strings: all the ASN.1 string types map to the Go - // type string. getUniversalType returns the tag for PrintableString - // when it sees a string, so if we see a different string type on the - // wire, we change the universal type to match. - if universalTag == TagPrintableString { - if t.class == ClassUniversal { - switch t.tag { - case TagIA5String, TagGeneralString, TagT61String, TagUTF8String: - universalTag = t.tag - } - } else if params.stringType != 0 { - universalTag = params.stringType - } - } - - // Special case for time: UTCTime and GeneralizedTime both map to the - // Go type time.Time. - if universalTag == TagUTCTime && t.tag == TagGeneralizedTime && t.class == ClassUniversal { - universalTag = TagGeneralizedTime - } - - if params.set { - universalTag = TagSet - } - - expectedClass := ClassUniversal - expectedTag := universalTag - - if !params.explicit && params.tag != nil { - expectedClass = ClassContextSpecific - expectedTag = *params.tag - } - - if !params.explicit && params.application && params.tag != nil { - expectedClass = ClassApplication - expectedTag = *params.tag - } - - // We have unwrapped any explicit tagging at this point. - if t.class != expectedClass || t.tag != expectedTag || t.isCompound != compoundType { - // Tags don't match. Again, it could be an optional element. - ok := setDefaultValue(v, params) - if ok { - offset = initOffset - } else { - err = StructuralError{fmt.Sprintf("tags don't match (%d vs %+v) %+v %s @%d", expectedTag, t, params, fieldType.Name(), offset)} - } - return - } - if invalidLength(offset, t.length, len(bytes)) { - err = SyntaxError{"data truncated"} - return - } - innerBytes := bytes[offset : offset+t.length] - offset += t.length - - // We deal with the structures defined in this package first. - switch fieldType { - case objectIdentifierType: - newSlice, err1 := parseObjectIdentifier(innerBytes) - v.Set(reflect.MakeSlice(v.Type(), len(newSlice), len(newSlice))) - if err1 == nil { - reflect.Copy(v, reflect.ValueOf(newSlice)) - } - err = err1 - return - case bitStringType: - bs, err1 := parseBitString(innerBytes) - if err1 == nil { - v.Set(reflect.ValueOf(bs)) - } - err = err1 - return - case timeType: - var time time.Time - var err1 error - if universalTag == TagUTCTime { - time, err1 = parseUTCTime(innerBytes) - } else { - time, err1 = parseGeneralizedTime(innerBytes) - } - if err1 == nil { - v.Set(reflect.ValueOf(time)) - } - err = err1 - return - case enumeratedType: - parsedInt, err1 := parseInt32(innerBytes) - if err1 == nil { - v.SetInt(int64(parsedInt)) - } - err = err1 - return - case flagType: - v.SetBool(true) - return - case bigIntType: - parsedInt, err1 := parseBigInt(innerBytes) - if err1 == nil { - v.Set(reflect.ValueOf(parsedInt)) - } - err = err1 - return - } - switch val := v; val.Kind() { - case reflect.Bool: - parsedBool, err1 := parseBool(innerBytes) - if err1 == nil { - val.SetBool(parsedBool) - } - err = err1 - return - case reflect.Int, reflect.Int32, reflect.Int64: - if val.Type().Size() == 4 { - parsedInt, err1 := parseInt32(innerBytes) - if err1 == nil { - val.SetInt(int64(parsedInt)) - } - err = err1 - } else { - parsedInt, err1 := parseInt64(innerBytes) - if err1 == nil { - val.SetInt(parsedInt) - } - err = err1 - } - return - // TODO(dfc) Add support for the remaining integer types - case reflect.Struct: - structType := fieldType - - if structType.NumField() > 0 && - structType.Field(0).Type == rawContentsType { - bytes := bytes[initOffset:offset] - val.Field(0).Set(reflect.ValueOf(RawContent(bytes))) - } - - innerOffset := 0 - for i := 0; i < structType.NumField(); i++ { - field := structType.Field(i) - if i == 0 && field.Type == rawContentsType { - continue - } - innerOffset, err = parseField(val.Field(i), innerBytes, innerOffset, parseFieldParameters(field.Tag.Get("asn1"))) - if err != nil { - return - } - } - // We allow extra bytes at the end of the SEQUENCE because - // adding elements to the end has been used in X.509 as the - // version numbers have increased. - return - case reflect.Slice: - sliceType := fieldType - if sliceType.Elem().Kind() == reflect.Uint8 { - val.Set(reflect.MakeSlice(sliceType, len(innerBytes), len(innerBytes))) - reflect.Copy(val, reflect.ValueOf(innerBytes)) - return - } - newSlice, err1 := parseSequenceOf(innerBytes, sliceType, sliceType.Elem()) - if err1 == nil { - val.Set(newSlice) - } - err = err1 - return - case reflect.String: - var v string - switch universalTag { - case TagPrintableString: - v, err = parsePrintableString(innerBytes) - case TagIA5String: - v, err = parseIA5String(innerBytes) - case TagT61String: - v, err = parseT61String(innerBytes) - case TagUTF8String: - v, err = parseUTF8String(innerBytes) - case TagGeneralString: - // GeneralString is specified in ISO-2022/ECMA-35, - // A brief review suggests that it includes structures - // that allow the encoding to change midstring and - // such. We give up and pass it as an 8-bit string. - v, err = parseT61String(innerBytes) - default: - err = SyntaxError{fmt.Sprintf("internal error: unknown string type %d", universalTag)} - } - if err == nil { - val.SetString(v) - } - return - } - err = StructuralError{"unsupported: " + v.Type().String()} - return -} - -// canHaveDefaultValue reports whether k is a Kind that we will set a default -// value for. (A signed integer, essentially.) -func canHaveDefaultValue(k reflect.Kind) bool { - switch k { - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - return true - } - - return false -} - -// setDefaultValue is used to install a default value, from a tag string, into -// a Value. It is successful if the field was optional, even if a default value -// wasn't provided or it failed to install it into the Value. -func setDefaultValue(v reflect.Value, params fieldParameters) (ok bool) { - if !params.optional { - return - } - ok = true - if params.defaultValue == nil { - return - } - if canHaveDefaultValue(v.Kind()) { - v.SetInt(*params.defaultValue) - } - return -} - -// Unmarshal parses the DER-encoded ASN.1 data structure b -// and uses the reflect package to fill in an arbitrary value pointed at by val. -// Because Unmarshal uses the reflect package, the structs -// being written to must use upper case field names. -// -// An ASN.1 INTEGER can be written to an int, int32, int64, -// or *big.Int (from the math/big package). -// If the encoded value does not fit in the Go type, -// Unmarshal returns a parse error. -// -// An ASN.1 BIT STRING can be written to a BitString. -// -// An ASN.1 OCTET STRING can be written to a []byte. -// -// An ASN.1 OBJECT IDENTIFIER can be written to an -// ObjectIdentifier. -// -// An ASN.1 ENUMERATED can be written to an Enumerated. -// -// An ASN.1 UTCTIME or GENERALIZEDTIME can be written to a time.Time. -// -// An ASN.1 PrintableString or IA5String can be written to a string. -// -// Any of the above ASN.1 values can be written to an interface{}. -// The value stored in the interface has the corresponding Go type. -// For integers, that type is int64. -// -// An ASN.1 SEQUENCE OF x or SET OF x can be written -// to a slice if an x can be written to the slice's element type. -// -// An ASN.1 SEQUENCE or SET can be written to a struct -// if each of the elements in the sequence can be -// written to the corresponding element in the struct. -// -// The following tags on struct fields have special meaning to Unmarshal: -// -// application specifies that a APPLICATION tag is used -// default:x sets the default value for optional integer fields -// explicit specifies that an additional, explicit tag wraps the implicit one -// optional marks the field as ASN.1 OPTIONAL -// set causes a SET, rather than a SEQUENCE type to be expected -// tag:x specifies the ASN.1 tag number; implies ASN.1 CONTEXT SPECIFIC -// -// If the type of the first field of a structure is RawContent then the raw -// ASN1 contents of the struct will be stored in it. -// -// If the type name of a slice element ends with "SET" then it's treated as if -// the "set" tag was set on it. This can be used with nested slices where a -// struct tag cannot be given. -// -// Other ASN.1 types are not supported; if it encounters them, -// Unmarshal returns a parse error. -func Unmarshal(b []byte, val interface{}) (rest []byte, err error) { - return UnmarshalWithParams(b, val, "") -} - -// UnmarshalWithParams allows field parameters to be specified for the -// top-level element. The form of the params is the same as the field tags. -func UnmarshalWithParams(b []byte, val interface{}, params string) (rest []byte, err error) { - v := reflect.ValueOf(val).Elem() - offset, err := parseField(v, b, 0, parseFieldParameters(params)) - if err != nil { - return nil, err - } - return b[offset:], nil -} diff --git a/vendor/github.com/jcmturner/gofork/encoding/asn1/common.go b/vendor/github.com/jcmturner/gofork/encoding/asn1/common.go deleted file mode 100644 index 7a9da49..0000000 --- a/vendor/github.com/jcmturner/gofork/encoding/asn1/common.go +++ /dev/null @@ -1,173 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package asn1 - -import ( - "reflect" - "strconv" - "strings" -) - -// ASN.1 objects have metadata preceding them: -// the tag: the type of the object -// a flag denoting if this object is compound or not -// the class type: the namespace of the tag -// the length of the object, in bytes - -// Here are some standard tags and classes - -// ASN.1 tags represent the type of the following object. -const ( - TagBoolean = 1 - TagInteger = 2 - TagBitString = 3 - TagOctetString = 4 - TagOID = 6 - TagEnum = 10 - TagUTF8String = 12 - TagSequence = 16 - TagSet = 17 - TagPrintableString = 19 - TagT61String = 20 - TagIA5String = 22 - TagUTCTime = 23 - TagGeneralizedTime = 24 - TagGeneralString = 27 -) - -// ASN.1 class types represent the namespace of the tag. -const ( - ClassUniversal = 0 - ClassApplication = 1 - ClassContextSpecific = 2 - ClassPrivate = 3 -) - -type tagAndLength struct { - class, tag, length int - isCompound bool -} - -// ASN.1 has IMPLICIT and EXPLICIT tags, which can be translated as "instead -// of" and "in addition to". When not specified, every primitive type has a -// default tag in the UNIVERSAL class. -// -// For example: a BIT STRING is tagged [UNIVERSAL 3] by default (although ASN.1 -// doesn't actually have a UNIVERSAL keyword). However, by saying [IMPLICIT -// CONTEXT-SPECIFIC 42], that means that the tag is replaced by another. -// -// On the other hand, if it said [EXPLICIT CONTEXT-SPECIFIC 10], then an -// /additional/ tag would wrap the default tag. This explicit tag will have the -// compound flag set. -// -// (This is used in order to remove ambiguity with optional elements.) -// -// You can layer EXPLICIT and IMPLICIT tags to an arbitrary depth, however we -// don't support that here. We support a single layer of EXPLICIT or IMPLICIT -// tagging with tag strings on the fields of a structure. - -// fieldParameters is the parsed representation of tag string from a structure field. -type fieldParameters struct { - optional bool // true iff the field is OPTIONAL - explicit bool // true iff an EXPLICIT tag is in use. - application bool // true iff an APPLICATION tag is in use. - defaultValue *int64 // a default value for INTEGER typed fields (maybe nil). - tag *int // the EXPLICIT or IMPLICIT tag (maybe nil). - stringType int // the string tag to use when marshaling. - timeType int // the time tag to use when marshaling. - set bool // true iff this should be encoded as a SET - omitEmpty bool // true iff this should be omitted if empty when marshaling. - - // Invariants: - // if explicit is set, tag is non-nil. -} - -// Given a tag string with the format specified in the package comment, -// parseFieldParameters will parse it into a fieldParameters structure, -// ignoring unknown parts of the string. -func parseFieldParameters(str string) (ret fieldParameters) { - for _, part := range strings.Split(str, ",") { - switch { - case part == "optional": - ret.optional = true - case part == "explicit": - ret.explicit = true - if ret.tag == nil { - ret.tag = new(int) - } - case part == "generalized": - ret.timeType = TagGeneralizedTime - case part == "utc": - ret.timeType = TagUTCTime - case part == "ia5": - ret.stringType = TagIA5String - // jtasn1 case below added - case part == "generalstring": - ret.stringType = TagGeneralString - case part == "printable": - ret.stringType = TagPrintableString - case part == "utf8": - ret.stringType = TagUTF8String - case strings.HasPrefix(part, "default:"): - i, err := strconv.ParseInt(part[8:], 10, 64) - if err == nil { - ret.defaultValue = new(int64) - *ret.defaultValue = i - } - case strings.HasPrefix(part, "tag:"): - i, err := strconv.Atoi(part[4:]) - if err == nil { - ret.tag = new(int) - *ret.tag = i - } - case part == "set": - ret.set = true - case part == "application": - ret.application = true - if ret.tag == nil { - ret.tag = new(int) - } - case part == "omitempty": - ret.omitEmpty = true - } - } - return -} - -// Given a reflected Go type, getUniversalType returns the default tag number -// and expected compound flag. -func getUniversalType(t reflect.Type) (tagNumber int, isCompound, ok bool) { - switch t { - case objectIdentifierType: - return TagOID, false, true - case bitStringType: - return TagBitString, false, true - case timeType: - return TagUTCTime, false, true - case enumeratedType: - return TagEnum, false, true - case bigIntType: - return TagInteger, false, true - } - switch t.Kind() { - case reflect.Bool: - return TagBoolean, false, true - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - return TagInteger, false, true - case reflect.Struct: - return TagSequence, true, true - case reflect.Slice: - if t.Elem().Kind() == reflect.Uint8 { - return TagOctetString, false, true - } - if strings.HasSuffix(t.Name(), "SET") { - return TagSet, true, true - } - return TagSequence, true, true - case reflect.String: - return TagPrintableString, false, true - } - return 0, false, false -} diff --git a/vendor/github.com/jcmturner/gofork/encoding/asn1/marshal.go b/vendor/github.com/jcmturner/gofork/encoding/asn1/marshal.go deleted file mode 100644 index f52eee9..0000000 --- a/vendor/github.com/jcmturner/gofork/encoding/asn1/marshal.go +++ /dev/null @@ -1,659 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package asn1 - -import ( - "bytes" - "errors" - "fmt" - "io" - "math/big" - "reflect" - "time" - "unicode/utf8" -) - -// A forkableWriter is an in-memory buffer that can be -// 'forked' to create new forkableWriters that bracket the -// original. After -// pre, post := w.fork() -// the overall sequence of bytes represented is logically w+pre+post. -type forkableWriter struct { - *bytes.Buffer - pre, post *forkableWriter -} - -func newForkableWriter() *forkableWriter { - return &forkableWriter{new(bytes.Buffer), nil, nil} -} - -func (f *forkableWriter) fork() (pre, post *forkableWriter) { - if f.pre != nil || f.post != nil { - panic("have already forked") - } - f.pre = newForkableWriter() - f.post = newForkableWriter() - return f.pre, f.post -} - -func (f *forkableWriter) Len() (l int) { - l += f.Buffer.Len() - if f.pre != nil { - l += f.pre.Len() - } - if f.post != nil { - l += f.post.Len() - } - return -} - -func (f *forkableWriter) writeTo(out io.Writer) (n int, err error) { - n, err = out.Write(f.Bytes()) - if err != nil { - return - } - - var nn int - - if f.pre != nil { - nn, err = f.pre.writeTo(out) - n += nn - if err != nil { - return - } - } - - if f.post != nil { - nn, err = f.post.writeTo(out) - n += nn - } - return -} - -func marshalBase128Int(out *forkableWriter, n int64) (err error) { - if n == 0 { - err = out.WriteByte(0) - return - } - - l := 0 - for i := n; i > 0; i >>= 7 { - l++ - } - - for i := l - 1; i >= 0; i-- { - o := byte(n >> uint(i*7)) - o &= 0x7f - if i != 0 { - o |= 0x80 - } - err = out.WriteByte(o) - if err != nil { - return - } - } - - return nil -} - -func marshalInt64(out *forkableWriter, i int64) (err error) { - n := int64Length(i) - - for ; n > 0; n-- { - err = out.WriteByte(byte(i >> uint((n-1)*8))) - if err != nil { - return - } - } - - return nil -} - -func int64Length(i int64) (numBytes int) { - numBytes = 1 - - for i > 127 { - numBytes++ - i >>= 8 - } - - for i < -128 { - numBytes++ - i >>= 8 - } - - return -} - -func marshalBigInt(out *forkableWriter, n *big.Int) (err error) { - if n.Sign() < 0 { - // A negative number has to be converted to two's-complement - // form. So we'll subtract 1 and invert. If the - // most-significant-bit isn't set then we'll need to pad the - // beginning with 0xff in order to keep the number negative. - nMinus1 := new(big.Int).Neg(n) - nMinus1.Sub(nMinus1, bigOne) - bytes := nMinus1.Bytes() - for i := range bytes { - bytes[i] ^= 0xff - } - if len(bytes) == 0 || bytes[0]&0x80 == 0 { - err = out.WriteByte(0xff) - if err != nil { - return - } - } - _, err = out.Write(bytes) - } else if n.Sign() == 0 { - // Zero is written as a single 0 zero rather than no bytes. - err = out.WriteByte(0x00) - } else { - bytes := n.Bytes() - if len(bytes) > 0 && bytes[0]&0x80 != 0 { - // We'll have to pad this with 0x00 in order to stop it - // looking like a negative number. - err = out.WriteByte(0) - if err != nil { - return - } - } - _, err = out.Write(bytes) - } - return -} - -func marshalLength(out *forkableWriter, i int) (err error) { - n := lengthLength(i) - - for ; n > 0; n-- { - err = out.WriteByte(byte(i >> uint((n-1)*8))) - if err != nil { - return - } - } - - return nil -} - -func lengthLength(i int) (numBytes int) { - numBytes = 1 - for i > 255 { - numBytes++ - i >>= 8 - } - return -} - -func marshalTagAndLength(out *forkableWriter, t tagAndLength) (err error) { - b := uint8(t.class) << 6 - if t.isCompound { - b |= 0x20 - } - if t.tag >= 31 { - b |= 0x1f - err = out.WriteByte(b) - if err != nil { - return - } - err = marshalBase128Int(out, int64(t.tag)) - if err != nil { - return - } - } else { - b |= uint8(t.tag) - err = out.WriteByte(b) - if err != nil { - return - } - } - - if t.length >= 128 { - l := lengthLength(t.length) - err = out.WriteByte(0x80 | byte(l)) - if err != nil { - return - } - err = marshalLength(out, t.length) - if err != nil { - return - } - } else { - err = out.WriteByte(byte(t.length)) - if err != nil { - return - } - } - - return nil -} - -func marshalBitString(out *forkableWriter, b BitString) (err error) { - paddingBits := byte((8 - b.BitLength%8) % 8) - err = out.WriteByte(paddingBits) - if err != nil { - return - } - _, err = out.Write(b.Bytes) - return -} - -func marshalObjectIdentifier(out *forkableWriter, oid []int) (err error) { - if len(oid) < 2 || oid[0] > 2 || (oid[0] < 2 && oid[1] >= 40) { - return StructuralError{"invalid object identifier"} - } - - err = marshalBase128Int(out, int64(oid[0]*40+oid[1])) - if err != nil { - return - } - for i := 2; i < len(oid); i++ { - err = marshalBase128Int(out, int64(oid[i])) - if err != nil { - return - } - } - - return -} - -func marshalPrintableString(out *forkableWriter, s string) (err error) { - b := []byte(s) - for _, c := range b { - if !isPrintable(c) { - return StructuralError{"PrintableString contains invalid character"} - } - } - - _, err = out.Write(b) - return -} - -func marshalIA5String(out *forkableWriter, s string) (err error) { - b := []byte(s) - for _, c := range b { - if c > 127 { - return StructuralError{"IA5String contains invalid character"} - } - } - - _, err = out.Write(b) - return -} - -func marshalUTF8String(out *forkableWriter, s string) (err error) { - _, err = out.Write([]byte(s)) - return -} - -func marshalTwoDigits(out *forkableWriter, v int) (err error) { - err = out.WriteByte(byte('0' + (v/10)%10)) - if err != nil { - return - } - return out.WriteByte(byte('0' + v%10)) -} - -func marshalFourDigits(out *forkableWriter, v int) (err error) { - var bytes [4]byte - for i := range bytes { - bytes[3-i] = '0' + byte(v%10) - v /= 10 - } - _, err = out.Write(bytes[:]) - return -} - -func outsideUTCRange(t time.Time) bool { - year := t.Year() - return year < 1950 || year >= 2050 -} - -func marshalUTCTime(out *forkableWriter, t time.Time) (err error) { - year := t.Year() - - switch { - case 1950 <= year && year < 2000: - err = marshalTwoDigits(out, year-1900) - case 2000 <= year && year < 2050: - err = marshalTwoDigits(out, year-2000) - default: - return StructuralError{"cannot represent time as UTCTime"} - } - if err != nil { - return - } - - return marshalTimeCommon(out, t) -} - -func marshalGeneralizedTime(out *forkableWriter, t time.Time) (err error) { - year := t.Year() - if year < 0 || year > 9999 { - return StructuralError{"cannot represent time as GeneralizedTime"} - } - if err = marshalFourDigits(out, year); err != nil { - return - } - - return marshalTimeCommon(out, t) -} - -func marshalTimeCommon(out *forkableWriter, t time.Time) (err error) { - _, month, day := t.Date() - - err = marshalTwoDigits(out, int(month)) - if err != nil { - return - } - - err = marshalTwoDigits(out, day) - if err != nil { - return - } - - hour, min, sec := t.Clock() - - err = marshalTwoDigits(out, hour) - if err != nil { - return - } - - err = marshalTwoDigits(out, min) - if err != nil { - return - } - - err = marshalTwoDigits(out, sec) - if err != nil { - return - } - - _, offset := t.Zone() - - switch { - case offset/60 == 0: - err = out.WriteByte('Z') - return - case offset > 0: - err = out.WriteByte('+') - case offset < 0: - err = out.WriteByte('-') - } - - if err != nil { - return - } - - offsetMinutes := offset / 60 - if offsetMinutes < 0 { - offsetMinutes = -offsetMinutes - } - - err = marshalTwoDigits(out, offsetMinutes/60) - if err != nil { - return - } - - err = marshalTwoDigits(out, offsetMinutes%60) - return -} - -func stripTagAndLength(in []byte) []byte { - _, offset, err := parseTagAndLength(in, 0) - if err != nil { - return in - } - return in[offset:] -} - -func marshalBody(out *forkableWriter, value reflect.Value, params fieldParameters) (err error) { - switch value.Type() { - case flagType: - return nil - case timeType: - t := value.Interface().(time.Time) - if params.timeType == TagGeneralizedTime || outsideUTCRange(t) { - return marshalGeneralizedTime(out, t) - } else { - return marshalUTCTime(out, t) - } - case bitStringType: - return marshalBitString(out, value.Interface().(BitString)) - case objectIdentifierType: - return marshalObjectIdentifier(out, value.Interface().(ObjectIdentifier)) - case bigIntType: - return marshalBigInt(out, value.Interface().(*big.Int)) - } - - switch v := value; v.Kind() { - case reflect.Bool: - if v.Bool() { - return out.WriteByte(255) - } else { - return out.WriteByte(0) - } - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - return marshalInt64(out, v.Int()) - case reflect.Struct: - t := v.Type() - - startingField := 0 - - // If the first element of the structure is a non-empty - // RawContents, then we don't bother serializing the rest. - if t.NumField() > 0 && t.Field(0).Type == rawContentsType { - s := v.Field(0) - if s.Len() > 0 { - bytes := make([]byte, s.Len()) - for i := 0; i < s.Len(); i++ { - bytes[i] = uint8(s.Index(i).Uint()) - } - /* The RawContents will contain the tag and - * length fields but we'll also be writing - * those ourselves, so we strip them out of - * bytes */ - _, err = out.Write(stripTagAndLength(bytes)) - return - } else { - startingField = 1 - } - } - - for i := startingField; i < t.NumField(); i++ { - var pre *forkableWriter - pre, out = out.fork() - err = marshalField(pre, v.Field(i), parseFieldParameters(t.Field(i).Tag.Get("asn1"))) - if err != nil { - return - } - } - return - case reflect.Slice: - sliceType := v.Type() - if sliceType.Elem().Kind() == reflect.Uint8 { - bytes := make([]byte, v.Len()) - for i := 0; i < v.Len(); i++ { - bytes[i] = uint8(v.Index(i).Uint()) - } - _, err = out.Write(bytes) - return - } - - // jtasn1 Pass on the tags to the members but need to unset explicit switch and implicit value - //var fp fieldParameters - params.explicit = false - params.tag = nil - for i := 0; i < v.Len(); i++ { - var pre *forkableWriter - pre, out = out.fork() - err = marshalField(pre, v.Index(i), params) - if err != nil { - return - } - } - return - case reflect.String: - switch params.stringType { - case TagIA5String: - return marshalIA5String(out, v.String()) - case TagPrintableString: - return marshalPrintableString(out, v.String()) - default: - return marshalUTF8String(out, v.String()) - } - } - - return StructuralError{"unknown Go type"} -} - -func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters) (err error) { - if !v.IsValid() { - return fmt.Errorf("asn1: cannot marshal nil value") - } - // If the field is an interface{} then recurse into it. - if v.Kind() == reflect.Interface && v.Type().NumMethod() == 0 { - return marshalField(out, v.Elem(), params) - } - - if v.Kind() == reflect.Slice && v.Len() == 0 && params.omitEmpty { - return - } - - if params.optional && params.defaultValue != nil && canHaveDefaultValue(v.Kind()) { - defaultValue := reflect.New(v.Type()).Elem() - defaultValue.SetInt(*params.defaultValue) - - if reflect.DeepEqual(v.Interface(), defaultValue.Interface()) { - return - } - } - - // If no default value is given then the zero value for the type is - // assumed to be the default value. This isn't obviously the correct - // behaviour, but it's what Go has traditionally done. - if params.optional && params.defaultValue == nil { - if reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface()) { - return - } - } - - if v.Type() == rawValueType { - rv := v.Interface().(RawValue) - if len(rv.FullBytes) != 0 { - _, err = out.Write(rv.FullBytes) - } else { - err = marshalTagAndLength(out, tagAndLength{rv.Class, rv.Tag, len(rv.Bytes), rv.IsCompound}) - if err != nil { - return - } - _, err = out.Write(rv.Bytes) - } - return - } - - tag, isCompound, ok := getUniversalType(v.Type()) - if !ok { - err = StructuralError{fmt.Sprintf("unknown Go type: %v", v.Type())} - return - } - class := ClassUniversal - - if params.timeType != 0 && tag != TagUTCTime { - return StructuralError{"explicit time type given to non-time member"} - } - - // jtasn1 updated to allow slices of strings - if params.stringType != 0 && !(tag == TagPrintableString || (v.Kind() == reflect.Slice && tag == 16 && v.Type().Elem().Kind() == reflect.String)) { - return StructuralError{"explicit string type given to non-string member"} - } - - switch tag { - case TagPrintableString: - if params.stringType == 0 { - // This is a string without an explicit string type. We'll use - // a PrintableString if the character set in the string is - // sufficiently limited, otherwise we'll use a UTF8String. - for _, r := range v.String() { - if r >= utf8.RuneSelf || !isPrintable(byte(r)) { - if !utf8.ValidString(v.String()) { - return errors.New("asn1: string not valid UTF-8") - } - tag = TagUTF8String - break - } - } - } else { - tag = params.stringType - } - case TagUTCTime: - if params.timeType == TagGeneralizedTime || outsideUTCRange(v.Interface().(time.Time)) { - tag = TagGeneralizedTime - } - } - - if params.set { - if tag != TagSequence { - return StructuralError{"non sequence tagged as set"} - } - tag = TagSet - } - - tags, body := out.fork() - - err = marshalBody(body, v, params) - if err != nil { - return - } - - bodyLen := body.Len() - - var explicitTag *forkableWriter - if params.explicit { - explicitTag, tags = tags.fork() - } - - if !params.explicit && params.tag != nil { - // implicit tag. - tag = *params.tag - class = ClassContextSpecific - } - - err = marshalTagAndLength(tags, tagAndLength{class, tag, bodyLen, isCompound}) - if err != nil { - return - } - - if params.explicit { - err = marshalTagAndLength(explicitTag, tagAndLength{ - class: ClassContextSpecific, - tag: *params.tag, - length: bodyLen + tags.Len(), - isCompound: true, - }) - } - - return err -} - -// Marshal returns the ASN.1 encoding of val. -// -// In addition to the struct tags recognised by Unmarshal, the following can be -// used: -// -// ia5: causes strings to be marshaled as ASN.1, IA5 strings -// omitempty: causes empty slices to be skipped -// printable: causes strings to be marshaled as ASN.1, PrintableString strings. -// utf8: causes strings to be marshaled as ASN.1, UTF8 strings -func Marshal(val interface{}) ([]byte, error) { - var out bytes.Buffer - v := reflect.ValueOf(val) - f := newForkableWriter() - err := marshalField(f, v, fieldParameters{}) - if err != nil { - return nil, err - } - _, err = f.writeTo(&out) - return out.Bytes(), err -} diff --git a/vendor/github.com/jcmturner/gofork/x/crypto/pbkdf2/pbkdf2.go b/vendor/github.com/jcmturner/gofork/x/crypto/pbkdf2/pbkdf2.go deleted file mode 100644 index 75d4187..0000000 --- a/vendor/github.com/jcmturner/gofork/x/crypto/pbkdf2/pbkdf2.go +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -/* -Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC -2898 / PKCS #5 v2.0. - -A key derivation function is useful when encrypting data based on a password -or any other not-fully-random data. It uses a pseudorandom function to derive -a secure encryption key based on the password. - -While v2.0 of the standard defines only one pseudorandom function to use, -HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved -Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To -choose, you can pass the `New` functions from the different SHA packages to -pbkdf2.Key. -*/ -package pbkdf2 - -import ( - "crypto/hmac" - "hash" -) - -// Key derives a key from the password, salt and iteration count, returning a -// []byte of length keylen that can be used as cryptographic key. The key is -// derived based on the method described as PBKDF2 with the HMAC variant using -// the supplied hash function. -// -// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you -// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by -// doing: -// -// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New) -// -// Remember to get a good random salt. At least 8 bytes is recommended by the -// RFC. -// -// Using a higher iteration count will increase the cost of an exhaustive -// search but will also make derivation proportionally slower. -func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte { - return Key64(password, salt, int64(iter), int64(keyLen), h) -} - -// Key64 derives a key from the password, salt and iteration count, returning a -// []byte of length keylen that can be used as cryptographic key. Key64 uses -// int64 for the iteration count and key length to allow larger values. -// The key is derived based on the method described as PBKDF2 with the HMAC -// variant using the supplied hash function. -// -// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you -// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by -// doing: -// -// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New) -// -// Remember to get a good random salt. At least 8 bytes is recommended by the -// RFC. -// -// Using a higher iteration count will increase the cost of an exhaustive -// search but will also make derivation proportionally slower. -func Key64(password, salt []byte, iter, keyLen int64, h func() hash.Hash) []byte { - prf := hmac.New(h, password) - hashLen := int64(prf.Size()) - numBlocks := (keyLen + hashLen - 1) / hashLen - - var buf [4]byte - dk := make([]byte, 0, numBlocks*hashLen) - U := make([]byte, hashLen) - for block := int64(1); block <= numBlocks; block++ { - // N.B.: || means concatenation, ^ means XOR - // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter - // U_1 = PRF(password, salt || uint(i)) - prf.Reset() - prf.Write(salt) - buf[0] = byte(block >> 24) - buf[1] = byte(block >> 16) - buf[2] = byte(block >> 8) - buf[3] = byte(block) - prf.Write(buf[:4]) - dk = prf.Sum(dk) - T := dk[int64(len(dk))-hashLen:] - copy(U, T) - - // U_n = PRF(password, U_(n-1)) - for n := int64(2); n <= iter; n++ { - prf.Reset() - prf.Write(U) - U = U[:0] - U = prf.Sum(U) - for x := range U { - T[x] ^= U[x] - } - } - } - return dk[:keyLen] -} diff --git a/vendor/github.com/jcmturner/goidentity/v6/LICENSE b/vendor/github.com/jcmturner/goidentity/v6/LICENSE deleted file mode 100644 index 8dada3e..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/jcmturner/goidentity/v6/README.md b/vendor/github.com/jcmturner/goidentity/v6/README.md deleted file mode 100644 index 3e15042..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# goidentity -[![GoDoc](https://godoc.org/github.com/jcmturner/goidentity/v6?status.svg)](https://godoc.org/github.com/jcmturner/goidentity/v6) [![Go Report Card](https://goreportcard.com/badge/github.com/jcmturner/goidentity/v6)](https://goreportcard.com/report/github.com/jcmturner/goidentity/v6) - -Please import as below -``` -import "github.com/jcmturner/goidentity/v6" -``` diff --git a/vendor/github.com/jcmturner/goidentity/v6/authenticator.go b/vendor/github.com/jcmturner/goidentity/v6/authenticator.go deleted file mode 100644 index 42ec79b..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/authenticator.go +++ /dev/null @@ -1,6 +0,0 @@ -package goidentity - -type Authenticator interface { - Authenticate() (Identity, bool, error) - Mechanism() string // gives the name of the type of authentication mechanism -} diff --git a/vendor/github.com/jcmturner/goidentity/v6/go.mod b/vendor/github.com/jcmturner/goidentity/v6/go.mod deleted file mode 100644 index 73cb36b..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/jcmturner/goidentity/v6 - -go 1.13 - -require ( - github.com/hashicorp/go-uuid v1.0.2 - github.com/stretchr/testify v1.4.0 -) diff --git a/vendor/github.com/jcmturner/goidentity/v6/go.sum b/vendor/github.com/jcmturner/goidentity/v6/go.sum deleted file mode 100644 index 92979e4..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/go.sum +++ /dev/null @@ -1,12 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/jcmturner/goidentity/v6/identity.go b/vendor/github.com/jcmturner/goidentity/v6/identity.go deleted file mode 100644 index f55d3b4..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/identity.go +++ /dev/null @@ -1,52 +0,0 @@ -package goidentity - -import ( - "context" - "net/http" - "time" -) - -const ( - CTXKey = "jcmturner/goidentity" -) - -type Identity interface { - UserName() string - SetUserName(s string) - Domain() string - SetDomain(s string) - DisplayName() string - SetDisplayName(s string) - Human() bool - SetHuman(b bool) - AuthTime() time.Time - SetAuthTime(t time.Time) - AuthzAttributes() []string - AddAuthzAttribute(a string) - RemoveAuthzAttribute(a string) - Authenticated() bool - SetAuthenticated(b bool) - Authorized(a string) bool - SessionID() string - Expired() bool - Attributes() map[string]interface{} - SetAttribute(k string, v interface{}) - SetAttributes(map[string]interface{}) - RemoveAttribute(k string) - Marshal() ([]byte, error) - Unmarshal([]byte) error -} - -func AddToHTTPRequestContext(id Identity, r *http.Request) *http.Request { - ctx := r.Context() - ctx = context.WithValue(ctx, CTXKey, id) - return r.WithContext(ctx) -} - -func FromHTTPRequestContext(r *http.Request) Identity { - ctx := r.Context() - if id, ok := ctx.Value(CTXKey).(Identity); ok { - return id - } - return nil -} diff --git a/vendor/github.com/jcmturner/goidentity/v6/user.go b/vendor/github.com/jcmturner/goidentity/v6/user.go deleted file mode 100644 index 88a7388..0000000 --- a/vendor/github.com/jcmturner/goidentity/v6/user.go +++ /dev/null @@ -1,172 +0,0 @@ -package goidentity - -import ( - "bytes" - "encoding/gob" - "github.com/hashicorp/go-uuid" - "time" -) - -type User struct { - authenticated bool - domain string - userName string - displayName string - email string - human bool - groupMembership map[string]bool - authTime time.Time - sessionID string - expiry time.Time - attributes map[string]interface{} -} - -func NewUser(username string) User { - uuid, err := uuid.GenerateUUID() - if err != nil { - uuid = "00unique-sess-ions-uuid-unavailable0" - } - return User{ - userName: username, - groupMembership: make(map[string]bool), - sessionID: uuid, - } -} - -func (u *User) UserName() string { - return u.userName -} - -func (u *User) SetUserName(s string) { - u.userName = s -} - -func (u *User) Domain() string { - return u.domain -} - -func (u *User) SetDomain(s string) { - u.domain = s -} - -func (u *User) DisplayName() string { - if u.displayName == "" { - return u.userName - } - return u.displayName -} - -func (u *User) SetDisplayName(s string) { - u.displayName = s -} - -func (u *User) Human() bool { - return u.human -} - -func (u *User) SetHuman(b bool) { - u.human = b -} - -func (u *User) AuthTime() time.Time { - return u.authTime -} - -func (u *User) SetAuthTime(t time.Time) { - u.authTime = t -} - -func (u *User) AuthzAttributes() []string { - s := make([]string, len(u.groupMembership)) - i := 0 - for a := range u.groupMembership { - s[i] = a - i++ - } - return s -} - -func (u *User) Authenticated() bool { - return u.authenticated -} - -func (u *User) SetAuthenticated(b bool) { - u.authenticated = b -} - -func (u *User) AddAuthzAttribute(a string) { - u.groupMembership[a] = true -} - -func (u *User) RemoveAuthzAttribute(a string) { - if _, ok := u.groupMembership[a]; !ok { - return - } - delete(u.groupMembership, a) -} - -func (u *User) EnableAuthzAttribute(a string) { - if enabled, ok := u.groupMembership[a]; ok && !enabled { - u.groupMembership[a] = true - } -} - -func (u *User) DisableAuthzAttribute(a string) { - if enabled, ok := u.groupMembership[a]; ok && enabled { - u.groupMembership[a] = false - } -} - -func (u *User) Authorized(a string) bool { - if enabled, ok := u.groupMembership[a]; ok && enabled { - return true - } - return false -} - -func (u *User) SessionID() string { - return u.sessionID -} - -func (u *User) SetExpiry(t time.Time) { - u.expiry = t -} - -func (u *User) Expired() bool { - if !u.expiry.IsZero() && time.Now().UTC().After(u.expiry) { - return true - } - return false -} - -func (u *User) Attributes() map[string]interface{} { - return u.attributes -} - -func (u *User) SetAttribute(k string, v interface{}) { - u.attributes[k] = v -} - -func (u *User) SetAttributes(a map[string]interface{}) { - u.attributes = a -} - -func (u *User) RemoveAttribute(k string) { - delete(u.attributes, k) -} - -func (u *User) Marshal() ([]byte, error) { - buf := new(bytes.Buffer) - enc := gob.NewEncoder(buf) - err := enc.Encode(u) - if err != nil { - return []byte{}, err - } - return buf.Bytes(), nil -} - -func (u *User) Unmarshal(b []byte) error { - buf := bytes.NewBuffer(b) - dec := gob.NewDecoder(buf) - return dec.Decode(u) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/LICENSE b/vendor/github.com/jcmturner/gokrb5/v8/LICENSE deleted file mode 100644 index 8dada3e..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/jcmturner/gokrb5/v8/asn1tools/tools.go b/vendor/github.com/jcmturner/gokrb5/v8/asn1tools/tools.go deleted file mode 100644 index f27740b..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/asn1tools/tools.go +++ /dev/null @@ -1,86 +0,0 @@ -// Package asn1tools provides tools for managing ASN1 marshaled data. -package asn1tools - -import ( - "github.com/jcmturner/gofork/encoding/asn1" -) - -// MarshalLengthBytes returns the ASN1 encoded bytes for the length 'l' -// -// There are two forms: short (for lengths between 0 and 127), and long definite (for lengths between 0 and 2^1008 -1). -// -// Short form: One octet. Bit 8 has value "0" and bits 7-1 give the length. -// -// Long form: Two to 127 octets. Bit 8 of first octet has value "1" and bits 7-1 give the number of additional length octets. Second and following octets give the length, base 256, most significant digit first. -func MarshalLengthBytes(l int) []byte { - if l <= 127 { - return []byte{byte(l)} - } - var b []byte - p := 1 - for i := 1; i < 127; { - b = append([]byte{byte((l % (p * 256)) / p)}, b...) - p = p * 256 - l = l - l%p - if l <= 0 { - break - } - } - return append([]byte{byte(128 + len(b))}, b...) -} - -// GetLengthFromASN returns the length of a slice of ASN1 encoded bytes from the ASN1 length header it contains. -func GetLengthFromASN(b []byte) int { - if int(b[1]) <= 127 { - return int(b[1]) - } - // The bytes that indicate the length - lb := b[2 : 2+int(b[1])-128] - base := 1 - l := 0 - for i := len(lb) - 1; i >= 0; i-- { - l += int(lb[i]) * base - base = base * 256 - } - return l -} - -// GetNumberBytesInLengthHeader returns the number of bytes in the ASn1 header that indicate the length. -func GetNumberBytesInLengthHeader(b []byte) int { - if int(b[1]) <= 127 { - return 1 - } - // The bytes that indicate the length - return 1 + int(b[1]) - 128 -} - -// AddASNAppTag adds an ASN1 encoding application tag value to the raw bytes provided. -func AddASNAppTag(b []byte, tag int) []byte { - r := asn1.RawValue{ - Class: asn1.ClassApplication, - IsCompound: true, - Tag: tag, - Bytes: b, - } - ab, _ := asn1.Marshal(r) - return ab -} - -/* -// The Marshal method of golang's asn1 package does not enable you to define wrapping the output in an application tag. -// This method adds that wrapping tag. -func AddASNAppTag(b []byte, tag int) []byte { - // The ASN1 wrapping consists of 2 bytes: - // 1st byte -> Identifier Octet - Application Tag - // 2nd byte -> The length (this will be the size indicated in the input bytes + 2 for the additional bytes we add here. - // Application Tag: - //| Bit: | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | - //| Value: | 0 | 1 | 1 | From the RFC spec 4120 | - //| Explanation | Defined by the ASN1 encoding rules for an application tag | A value of 1 indicates a constructed type | The ASN Application tag value | - // Therefore the value of the byte is an integer = ( Application tag value + 96 ) - //b = append(MarshalLengthBytes(int(b[1])+2), b...) - b = append(MarshalLengthBytes(len(b)), b...) - b = append([]byte{byte(96 + tag)}, b...) - return b -} -*/ diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/ASExchange.go b/vendor/github.com/jcmturner/gokrb5/v8/client/ASExchange.go deleted file mode 100644 index 5becccc..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/ASExchange.go +++ /dev/null @@ -1,182 +0,0 @@ -package client - -import ( - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/crypto/etype" - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/patype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// ASExchange performs an AS exchange for the client to retrieve a TGT. -func (cl *Client) ASExchange(realm string, ASReq messages.ASReq, referral int) (messages.ASRep, error) { - if ok, err := cl.IsConfigured(); !ok { - return messages.ASRep{}, krberror.Errorf(err, krberror.ConfigError, "AS Exchange cannot be performed") - } - - // Set PAData if required - err := setPAData(cl, nil, &ASReq) - if err != nil { - return messages.ASRep{}, krberror.Errorf(err, krberror.KRBMsgError, "AS Exchange Error: issue with setting PAData on AS_REQ") - } - - b, err := ASReq.Marshal() - if err != nil { - return messages.ASRep{}, krberror.Errorf(err, krberror.EncodingError, "AS Exchange Error: failed marshaling AS_REQ") - } - var ASRep messages.ASRep - - rb, err := cl.sendToKDC(b, realm) - if err != nil { - if e, ok := err.(messages.KRBError); ok { - switch e.ErrorCode { - case errorcode.KDC_ERR_PREAUTH_REQUIRED, errorcode.KDC_ERR_PREAUTH_FAILED: - // From now on assume this client will need to do this pre-auth and set the PAData - cl.settings.assumePreAuthentication = true - err = setPAData(cl, &e, &ASReq) - if err != nil { - return messages.ASRep{}, krberror.Errorf(err, krberror.KRBMsgError, "AS Exchange Error: failed setting AS_REQ PAData for pre-authentication required") - } - b, err := ASReq.Marshal() - if err != nil { - return messages.ASRep{}, krberror.Errorf(err, krberror.EncodingError, "AS Exchange Error: failed marshaling AS_REQ with PAData") - } - rb, err = cl.sendToKDC(b, realm) - if err != nil { - if _, ok := err.(messages.KRBError); ok { - return messages.ASRep{}, krberror.Errorf(err, krberror.KDCError, "AS Exchange Error: kerberos error response from KDC") - } - return messages.ASRep{}, krberror.Errorf(err, krberror.NetworkingError, "AS Exchange Error: failed sending AS_REQ to KDC") - } - case errorcode.KDC_ERR_WRONG_REALM: - // Client referral https://tools.ietf.org/html/rfc6806.html#section-7 - if referral > 5 { - return messages.ASRep{}, krberror.Errorf(err, krberror.KRBMsgError, "maximum number of client referrals exceeded") - } - referral++ - return cl.ASExchange(e.CRealm, ASReq, referral) - default: - return messages.ASRep{}, krberror.Errorf(err, krberror.KDCError, "AS Exchange Error: kerberos error response from KDC") - } - } else { - return messages.ASRep{}, krberror.Errorf(err, krberror.NetworkingError, "AS Exchange Error: failed sending AS_REQ to KDC") - } - } - err = ASRep.Unmarshal(rb) - if err != nil { - return messages.ASRep{}, krberror.Errorf(err, krberror.EncodingError, "AS Exchange Error: failed to process the AS_REP") - } - if ok, err := ASRep.Verify(cl.Config, cl.Credentials, ASReq); !ok { - return messages.ASRep{}, krberror.Errorf(err, krberror.KRBMsgError, "AS Exchange Error: AS_REP is not valid or client password/keytab incorrect") - } - return ASRep, nil -} - -// setPAData adds pre-authentication data to the AS_REQ. -func setPAData(cl *Client, krberr *messages.KRBError, ASReq *messages.ASReq) error { - if !cl.settings.DisablePAFXFAST() { - pa := types.PAData{PADataType: patype.PA_REQ_ENC_PA_REP} - ASReq.PAData = append(ASReq.PAData, pa) - } - if cl.settings.AssumePreAuthentication() { - // Identify the etype to use to encrypt the PA Data - var et etype.EType - var err error - var key types.EncryptionKey - var kvno int - if krberr == nil { - // This is not in response to an error from the KDC. It is preemptive or renewal - // There is no KRB Error that tells us the etype to use - etn := cl.settings.preAuthEType // Use the etype that may have previously been negotiated - if etn == 0 { - etn = int32(cl.Config.LibDefaults.PreferredPreauthTypes[0]) // Resort to config - } - et, err = crypto.GetEtype(etn) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error getting etype for pre-auth encryption") - } - key, kvno, err = cl.Key(et, 0, nil) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error getting key from credentials") - } - } else { - // Get the etype to use from the PA data in the KRBError e-data - et, err = preAuthEType(krberr) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error getting etype for pre-auth encryption") - } - cl.settings.preAuthEType = et.GetETypeID() // Set the etype that has been defined for potential future use - key, kvno, err = cl.Key(et, 0, krberr) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error getting key from credentials") - } - } - // Generate the PA data - paTSb, err := types.GetPAEncTSEncAsnMarshalled() - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "error creating PAEncTSEnc for Pre-Authentication") - } - paEncTS, err := crypto.GetEncryptedData(paTSb, key, keyusage.AS_REQ_PA_ENC_TIMESTAMP, kvno) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error encrypting pre-authentication timestamp") - } - pb, err := paEncTS.Marshal() - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error marshaling the PAEncTSEnc encrypted data") - } - pa := types.PAData{ - PADataType: patype.PA_ENC_TIMESTAMP, - PADataValue: pb, - } - // Look for and delete any exiting patype.PA_ENC_TIMESTAMP - for i, pa := range ASReq.PAData { - if pa.PADataType == patype.PA_ENC_TIMESTAMP { - ASReq.PAData[i] = ASReq.PAData[len(ASReq.PAData)-1] - ASReq.PAData = ASReq.PAData[:len(ASReq.PAData)-1] - } - } - ASReq.PAData = append(ASReq.PAData, pa) - } - return nil -} - -// preAuthEType establishes what encryption type to use for pre-authentication from the KRBError returned from the KDC. -func preAuthEType(krberr *messages.KRBError) (etype etype.EType, err error) { - //RFC 4120 5.2.7.5 covers the preference order of ETYPE-INFO2 and ETYPE-INFO. - var etypeID int32 - var pas types.PADataSequence - e := pas.Unmarshal(krberr.EData) - if e != nil { - err = krberror.Errorf(e, krberror.EncodingError, "error unmashalling KRBError data") - return - } -Loop: - for _, pa := range pas { - switch pa.PADataType { - case patype.PA_ETYPE_INFO2: - info, e := pa.GetETypeInfo2() - if e != nil { - err = krberror.Errorf(e, krberror.EncodingError, "error unmashalling ETYPE-INFO2 data") - return - } - etypeID = info[0].EType - break Loop - case patype.PA_ETYPE_INFO: - info, e := pa.GetETypeInfo() - if e != nil { - err = krberror.Errorf(e, krberror.EncodingError, "error unmashalling ETYPE-INFO data") - return - } - etypeID = info[0].EType - } - } - etype, e = crypto.GetEtype(etypeID) - if e != nil { - err = krberror.Errorf(e, krberror.EncryptingError, "error creating etype") - return - } - return etype, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/TGSExchange.go b/vendor/github.com/jcmturner/gokrb5/v8/client/TGSExchange.go deleted file mode 100644 index e4571ce..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/TGSExchange.go +++ /dev/null @@ -1,103 +0,0 @@ -package client - -import ( - "github.com/jcmturner/gokrb5/v8/iana/flags" - "github.com/jcmturner/gokrb5/v8/iana/nametype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// TGSREQGenerateAndExchange generates the TGS_REQ and performs a TGS exchange to retrieve a ticket to the specified SPN. -func (cl *Client) TGSREQGenerateAndExchange(spn types.PrincipalName, kdcRealm string, tgt messages.Ticket, sessionKey types.EncryptionKey, renewal bool) (tgsReq messages.TGSReq, tgsRep messages.TGSRep, err error) { - tgsReq, err = messages.NewTGSReq(cl.Credentials.CName(), kdcRealm, cl.Config, tgt, sessionKey, spn, renewal) - if err != nil { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.KRBMsgError, "TGS Exchange Error: failed to generate a new TGS_REQ") - } - return cl.TGSExchange(tgsReq, kdcRealm, tgsRep.Ticket, sessionKey, 0) -} - -// TGSExchange exchanges the provided TGS_REQ with the KDC to retrieve a TGS_REP. -// Referrals are automatically handled. -// The client's cache is updated with the ticket received. -func (cl *Client) TGSExchange(tgsReq messages.TGSReq, kdcRealm string, tgt messages.Ticket, sessionKey types.EncryptionKey, referral int) (messages.TGSReq, messages.TGSRep, error) { - var tgsRep messages.TGSRep - b, err := tgsReq.Marshal() - if err != nil { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.EncodingError, "TGS Exchange Error: failed to marshal TGS_REQ") - } - r, err := cl.sendToKDC(b, kdcRealm) - if err != nil { - if _, ok := err.(messages.KRBError); ok { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.KDCError, "TGS Exchange Error: kerberos error response from KDC when requesting for %s", tgsReq.ReqBody.SName.PrincipalNameString()) - } - return tgsReq, tgsRep, krberror.Errorf(err, krberror.NetworkingError, "TGS Exchange Error: issue sending TGS_REQ to KDC") - } - err = tgsRep.Unmarshal(r) - if err != nil { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.EncodingError, "TGS Exchange Error: failed to process the TGS_REP") - } - err = tgsRep.DecryptEncPart(sessionKey) - if err != nil { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.EncodingError, "TGS Exchange Error: failed to process the TGS_REP") - } - if ok, err := tgsRep.Verify(cl.Config, tgsReq); !ok { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.EncodingError, "TGS Exchange Error: TGS_REP is not valid") - } - - if tgsRep.Ticket.SName.NameString[0] == "krbtgt" && !tgsRep.Ticket.SName.Equal(tgsReq.ReqBody.SName) { - if referral > 5 { - return tgsReq, tgsRep, krberror.Errorf(err, krberror.KRBMsgError, "TGS Exchange Error: maximum number of referrals exceeded") - } - // Server referral https://tools.ietf.org/html/rfc6806.html#section-8 - // The TGS Rep contains a TGT for another domain as the service resides in that domain. - cl.addSession(tgsRep.Ticket, tgsRep.DecryptedEncPart) - realm := tgsRep.Ticket.SName.NameString[len(tgsRep.Ticket.SName.NameString)-1] - referral++ - if types.IsFlagSet(&tgsReq.ReqBody.KDCOptions, flags.EncTktInSkey) && len(tgsReq.ReqBody.AdditionalTickets) > 0 { - tgsReq, err = messages.NewUser2UserTGSReq(cl.Credentials.CName(), kdcRealm, cl.Config, tgt, sessionKey, tgsReq.ReqBody.SName, tgsReq.Renewal, tgsReq.ReqBody.AdditionalTickets[0]) - if err != nil { - return tgsReq, tgsRep, err - } - } - tgsReq, err = messages.NewTGSReq(cl.Credentials.CName(), realm, cl.Config, tgsRep.Ticket, tgsRep.DecryptedEncPart.Key, tgsReq.ReqBody.SName, tgsReq.Renewal) - if err != nil { - return tgsReq, tgsRep, err - } - return cl.TGSExchange(tgsReq, realm, tgsRep.Ticket, tgsRep.DecryptedEncPart.Key, referral) - } - cl.cache.addEntry( - tgsRep.Ticket, - tgsRep.DecryptedEncPart.AuthTime, - tgsRep.DecryptedEncPart.StartTime, - tgsRep.DecryptedEncPart.EndTime, - tgsRep.DecryptedEncPart.RenewTill, - tgsRep.DecryptedEncPart.Key, - ) - cl.Log("ticket added to cache for %s (EndTime: %v)", tgsRep.Ticket.SName.PrincipalNameString(), tgsRep.DecryptedEncPart.EndTime) - return tgsReq, tgsRep, err -} - -// GetServiceTicket makes a request to get a service ticket for the SPN specified -// SPN format: / Eg. HTTP/www.example.com -// The ticket will be added to the client's ticket cache -func (cl *Client) GetServiceTicket(spn string) (messages.Ticket, types.EncryptionKey, error) { - var tkt messages.Ticket - var skey types.EncryptionKey - if tkt, skey, ok := cl.GetCachedTicket(spn); ok { - // Already a valid ticket in the cache - return tkt, skey, nil - } - princ := types.NewPrincipalName(nametype.KRB_NT_PRINCIPAL, spn) - realm := cl.Config.ResolveRealm(princ.NameString[len(princ.NameString)-1]) - - tgt, skey, err := cl.sessionTGT(realm) - if err != nil { - return tkt, skey, err - } - _, tgsRep, err := cl.TGSREQGenerateAndExchange(princ, realm, tgt, skey, false) - if err != nil { - return tkt, skey, err - } - return tgsRep.Ticket, tgsRep.DecryptedEncPart.Key, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/cache.go b/vendor/github.com/jcmturner/gokrb5/v8/client/cache.go deleted file mode 100644 index 552e73e..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/cache.go +++ /dev/null @@ -1,134 +0,0 @@ -package client - -import ( - "encoding/json" - "errors" - "sort" - "sync" - "time" - - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// Cache for service tickets held by the client. -type Cache struct { - Entries map[string]CacheEntry - mux sync.RWMutex -} - -// CacheEntry holds details for a cache entry. -type CacheEntry struct { - SPN string - Ticket messages.Ticket `json:"-"` - AuthTime time.Time - StartTime time.Time - EndTime time.Time - RenewTill time.Time - SessionKey types.EncryptionKey `json:"-"` -} - -// NewCache creates a new client ticket cache instance. -func NewCache() *Cache { - return &Cache{ - Entries: map[string]CacheEntry{}, - } -} - -// getEntry returns a cache entry that matches the SPN. -func (c *Cache) getEntry(spn string) (CacheEntry, bool) { - c.mux.RLock() - defer c.mux.RUnlock() - e, ok := (*c).Entries[spn] - return e, ok -} - -// JSON returns information about the cached service tickets in a JSON format. -func (c *Cache) JSON() (string, error) { - c.mux.RLock() - defer c.mux.RUnlock() - var es []CacheEntry - keys := make([]string, 0, len(c.Entries)) - for k := range c.Entries { - keys = append(keys, k) - } - sort.Strings(keys) - for _, k := range keys { - es = append(es, c.Entries[k]) - } - b, err := json.MarshalIndent(&es, "", " ") - if err != nil { - return "", err - } - return string(b), nil -} - -// addEntry adds a ticket to the cache. -func (c *Cache) addEntry(tkt messages.Ticket, authTime, startTime, endTime, renewTill time.Time, sessionKey types.EncryptionKey) CacheEntry { - spn := tkt.SName.PrincipalNameString() - c.mux.Lock() - defer c.mux.Unlock() - (*c).Entries[spn] = CacheEntry{ - SPN: spn, - Ticket: tkt, - AuthTime: authTime, - StartTime: startTime, - EndTime: endTime, - RenewTill: renewTill, - SessionKey: sessionKey, - } - return c.Entries[spn] -} - -// clear deletes all the cache entries -func (c *Cache) clear() { - c.mux.Lock() - defer c.mux.Unlock() - for k := range c.Entries { - delete(c.Entries, k) - } -} - -// RemoveEntry removes the cache entry for the defined SPN. -func (c *Cache) RemoveEntry(spn string) { - c.mux.Lock() - defer c.mux.Unlock() - delete(c.Entries, spn) -} - -// GetCachedTicket returns a ticket from the cache for the SPN. -// Only a ticket that is currently valid will be returned. -func (cl *Client) GetCachedTicket(spn string) (messages.Ticket, types.EncryptionKey, bool) { - if e, ok := cl.cache.getEntry(spn); ok { - //If within time window of ticket return it - if time.Now().UTC().After(e.StartTime) && time.Now().UTC().Before(e.EndTime) { - cl.Log("ticket received from cache for %s", spn) - return e.Ticket, e.SessionKey, true - } else if time.Now().UTC().Before(e.RenewTill) { - e, err := cl.renewTicket(e) - if err != nil { - return e.Ticket, e.SessionKey, false - } - return e.Ticket, e.SessionKey, true - } - } - var tkt messages.Ticket - var key types.EncryptionKey - return tkt, key, false -} - -// renewTicket renews a cache entry ticket. -// To renew from outside the client package use GetCachedTicket -func (cl *Client) renewTicket(e CacheEntry) (CacheEntry, error) { - spn := e.Ticket.SName - _, _, err := cl.TGSREQGenerateAndExchange(spn, e.Ticket.Realm, e.Ticket, e.SessionKey, true) - if err != nil { - return e, err - } - e, ok := cl.cache.getEntry(e.Ticket.SName.PrincipalNameString()) - if !ok { - return e, errors.New("ticket was not added to cache") - } - cl.Log("ticket renewed for %s (EndTime: %v)", spn.PrincipalNameString(), e.EndTime) - return e, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/client.go b/vendor/github.com/jcmturner/gokrb5/v8/client/client.go deleted file mode 100644 index 074e3f1..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/client.go +++ /dev/null @@ -1,329 +0,0 @@ -// Package client provides a client library and methods for Kerberos 5 authentication. -package client - -import ( - "encoding/json" - "errors" - "fmt" - "io" - "strings" - "time" - - "github.com/jcmturner/gokrb5/v8/config" - "github.com/jcmturner/gokrb5/v8/credentials" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/crypto/etype" - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/iana/nametype" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// Client side configuration and state. -type Client struct { - Credentials *credentials.Credentials - Config *config.Config - settings *Settings - sessions *sessions - cache *Cache -} - -// NewWithPassword creates a new client from a password credential. -// Set the realm to empty string to use the default realm from config. -func NewWithPassword(username, realm, password string, krb5conf *config.Config, settings ...func(*Settings)) *Client { - creds := credentials.New(username, realm) - return &Client{ - Credentials: creds.WithPassword(password), - Config: krb5conf, - settings: NewSettings(settings...), - sessions: &sessions{ - Entries: make(map[string]*session), - }, - cache: NewCache(), - } -} - -// NewWithKeytab creates a new client from a keytab credential. -func NewWithKeytab(username, realm string, kt *keytab.Keytab, krb5conf *config.Config, settings ...func(*Settings)) *Client { - creds := credentials.New(username, realm) - return &Client{ - Credentials: creds.WithKeytab(kt), - Config: krb5conf, - settings: NewSettings(settings...), - sessions: &sessions{ - Entries: make(map[string]*session), - }, - cache: NewCache(), - } -} - -// NewFromCCache create a client from a populated client cache. -// -// WARNING: A client created from CCache does not automatically renew TGTs and a failure will occur after the TGT expires. -func NewFromCCache(c *credentials.CCache, krb5conf *config.Config, settings ...func(*Settings)) (*Client, error) { - cl := &Client{ - Credentials: c.GetClientCredentials(), - Config: krb5conf, - settings: NewSettings(settings...), - sessions: &sessions{ - Entries: make(map[string]*session), - }, - cache: NewCache(), - } - spn := types.PrincipalName{ - NameType: nametype.KRB_NT_SRV_INST, - NameString: []string{"krbtgt", c.DefaultPrincipal.Realm}, - } - cred, ok := c.GetEntry(spn) - if !ok { - return cl, errors.New("TGT not found in CCache") - } - var tgt messages.Ticket - err := tgt.Unmarshal(cred.Ticket) - if err != nil { - return cl, fmt.Errorf("TGT bytes in cache are not valid: %v", err) - } - cl.sessions.Entries[c.DefaultPrincipal.Realm] = &session{ - realm: c.DefaultPrincipal.Realm, - authTime: cred.AuthTime, - endTime: cred.EndTime, - renewTill: cred.RenewTill, - tgt: tgt, - sessionKey: cred.Key, - } - for _, cred := range c.GetEntries() { - var tkt messages.Ticket - err = tkt.Unmarshal(cred.Ticket) - if err != nil { - return cl, fmt.Errorf("cache entry ticket bytes are not valid: %v", err) - } - cl.cache.addEntry( - tkt, - cred.AuthTime, - cred.StartTime, - cred.EndTime, - cred.RenewTill, - cred.Key, - ) - } - return cl, nil -} - -// Key returns the client's encryption key for the specified encryption type and its kvno (kvno of zero will find latest). -// The key can be retrieved either from the keytab or generated from the client's password. -// If the client has both a keytab and a password defined the keytab is favoured as the source for the key -// A KRBError can be passed in the event the KDC returns one of type KDC_ERR_PREAUTH_REQUIRED and is required to derive -// the key for pre-authentication from the client's password. If a KRBError is not available, pass nil to this argument. -func (cl *Client) Key(etype etype.EType, kvno int, krberr *messages.KRBError) (types.EncryptionKey, int, error) { - if cl.Credentials.HasKeytab() && etype != nil { - return cl.Credentials.Keytab().GetEncryptionKey(cl.Credentials.CName(), cl.Credentials.Domain(), kvno, etype.GetETypeID()) - } else if cl.Credentials.HasPassword() { - if krberr != nil && krberr.ErrorCode == errorcode.KDC_ERR_PREAUTH_REQUIRED { - var pas types.PADataSequence - err := pas.Unmarshal(krberr.EData) - if err != nil { - return types.EncryptionKey{}, 0, fmt.Errorf("could not get PAData from KRBError to generate key from password: %v", err) - } - key, _, err := crypto.GetKeyFromPassword(cl.Credentials.Password(), krberr.CName, krberr.CRealm, etype.GetETypeID(), pas) - return key, 0, err - } - key, _, err := crypto.GetKeyFromPassword(cl.Credentials.Password(), cl.Credentials.CName(), cl.Credentials.Domain(), etype.GetETypeID(), types.PADataSequence{}) - return key, 0, err - } - return types.EncryptionKey{}, 0, errors.New("credential has neither keytab or password to generate key") -} - -// IsConfigured indicates if the client has the values required set. -func (cl *Client) IsConfigured() (bool, error) { - if cl.Credentials.UserName() == "" { - return false, errors.New("client does not have a username") - } - if cl.Credentials.Domain() == "" { - return false, errors.New("client does not have a define realm") - } - // Client needs to have either a password, keytab or a session already (later when loading from CCache) - if !cl.Credentials.HasPassword() && !cl.Credentials.HasKeytab() { - authTime, _, _, _, err := cl.sessionTimes(cl.Credentials.Domain()) - if err != nil || authTime.IsZero() { - return false, errors.New("client has neither a keytab nor a password set and no session") - } - } - if !cl.Config.LibDefaults.DNSLookupKDC { - for _, r := range cl.Config.Realms { - if r.Realm == cl.Credentials.Domain() { - if len(r.KDC) > 0 { - return true, nil - } - return false, errors.New("client krb5 config does not have any defined KDCs for the default realm") - } - } - } - return true, nil -} - -// Login the client with the KDC via an AS exchange. -func (cl *Client) Login() error { - if ok, err := cl.IsConfigured(); !ok { - return err - } - if !cl.Credentials.HasPassword() && !cl.Credentials.HasKeytab() { - _, endTime, _, _, err := cl.sessionTimes(cl.Credentials.Domain()) - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "no user credentials available and error getting any existing session") - } - if time.Now().UTC().After(endTime) { - return krberror.New(krberror.KRBMsgError, "cannot login, no user credentials available and no valid existing session") - } - // no credentials but there is a session with tgt already - return nil - } - ASReq, err := messages.NewASReqForTGT(cl.Credentials.Domain(), cl.Config, cl.Credentials.CName()) - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "error generating new AS_REQ") - } - ASRep, err := cl.ASExchange(cl.Credentials.Domain(), ASReq, 0) - if err != nil { - return err - } - cl.addSession(ASRep.Ticket, ASRep.DecryptedEncPart) - return nil -} - -// AffirmLogin will only perform an AS exchange with the KDC if the client does not already have a TGT. -func (cl *Client) AffirmLogin() error { - _, endTime, _, _, err := cl.sessionTimes(cl.Credentials.Domain()) - if err != nil || time.Now().UTC().After(endTime) { - err := cl.Login() - if err != nil { - return fmt.Errorf("could not get valid TGT for client's realm: %v", err) - } - } - return nil -} - -// realmLogin obtains or renews a TGT and establishes a session for the realm specified. -func (cl *Client) realmLogin(realm string) error { - if realm == cl.Credentials.Domain() { - return cl.Login() - } - _, endTime, _, _, err := cl.sessionTimes(cl.Credentials.Domain()) - if err != nil || time.Now().UTC().After(endTime) { - err := cl.Login() - if err != nil { - return fmt.Errorf("could not get valid TGT for client's realm: %v", err) - } - } - tgt, skey, err := cl.sessionTGT(cl.Credentials.Domain()) - if err != nil { - return err - } - - spn := types.PrincipalName{ - NameType: nametype.KRB_NT_SRV_INST, - NameString: []string{"krbtgt", realm}, - } - - _, tgsRep, err := cl.TGSREQGenerateAndExchange(spn, cl.Credentials.Domain(), tgt, skey, false) - if err != nil { - return err - } - cl.addSession(tgsRep.Ticket, tgsRep.DecryptedEncPart) - - return nil -} - -// Destroy stops the auto-renewal of all sessions and removes the sessions and cache entries from the client. -func (cl *Client) Destroy() { - creds := credentials.New("", "") - cl.sessions.destroy() - cl.cache.clear() - cl.Credentials = creds - cl.Log("client destroyed") -} - -// Diagnostics runs a set of checks that the client is properly configured and writes details to the io.Writer provided. -func (cl *Client) Diagnostics(w io.Writer) error { - cl.Print(w) - var errs []string - if cl.Credentials.HasKeytab() { - var loginRealmEncTypes []int32 - for _, e := range cl.Credentials.Keytab().Entries { - if e.Principal.Realm == cl.Credentials.Realm() { - loginRealmEncTypes = append(loginRealmEncTypes, e.Key.KeyType) - } - } - for _, et := range cl.Config.LibDefaults.DefaultTktEnctypeIDs { - var etInKt bool - for _, val := range loginRealmEncTypes { - if val == et { - etInKt = true - break - } - } - if !etInKt { - errs = append(errs, fmt.Sprintf("default_tkt_enctypes specifies %d but this enctype is not available in the client's keytab", et)) - } - } - for _, et := range cl.Config.LibDefaults.PreferredPreauthTypes { - var etInKt bool - for _, val := range loginRealmEncTypes { - if int(val) == et { - etInKt = true - break - } - } - if !etInKt { - errs = append(errs, fmt.Sprintf("preferred_preauth_types specifies %d but this enctype is not available in the client's keytab", et)) - } - } - } - udpCnt, udpKDC, err := cl.Config.GetKDCs(cl.Credentials.Realm(), false) - if err != nil { - errs = append(errs, fmt.Sprintf("error when resolving KDCs for UDP communication: %v", err)) - } - if udpCnt < 1 { - errs = append(errs, "no KDCs resolved for communication via UDP.") - } else { - b, _ := json.MarshalIndent(&udpKDC, "", " ") - fmt.Fprintf(w, "UDP KDCs: %s\n", string(b)) - } - tcpCnt, tcpKDC, err := cl.Config.GetKDCs(cl.Credentials.Realm(), false) - if err != nil { - errs = append(errs, fmt.Sprintf("error when resolving KDCs for TCP communication: %v", err)) - } - if tcpCnt < 1 { - errs = append(errs, "no KDCs resolved for communication via TCP.") - } else { - b, _ := json.MarshalIndent(&tcpKDC, "", " ") - fmt.Fprintf(w, "TCP KDCs: %s\n", string(b)) - } - - if errs == nil || len(errs) < 1 { - return nil - } - err = fmt.Errorf(strings.Join(errs, "\n")) - return err -} - -// Print writes the details of the client to the io.Writer provided. -func (cl *Client) Print(w io.Writer) { - c, _ := cl.Credentials.JSON() - fmt.Fprintf(w, "Credentials:\n%s\n", c) - - s, _ := cl.sessions.JSON() - fmt.Fprintf(w, "TGT Sessions:\n%s\n", s) - - c, _ = cl.cache.JSON() - fmt.Fprintf(w, "Service ticket cache:\n%s\n", c) - - s, _ = cl.settings.JSON() - fmt.Fprintf(w, "Settings:\n%s\n", s) - - j, _ := cl.Config.JSON() - fmt.Fprintf(w, "Krb5 config:\n%s\n", j) - - k, _ := cl.Credentials.Keytab().JSON() - fmt.Fprintf(w, "Keytab:\n%s\n", k) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/network.go b/vendor/github.com/jcmturner/gokrb5/v8/client/network.go deleted file mode 100644 index 9ca0e37..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/network.go +++ /dev/null @@ -1,213 +0,0 @@ -package client - -import ( - "bytes" - "encoding/binary" - "errors" - "fmt" - "io" - "net" - "time" - - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/messages" -) - -// SendToKDC performs network actions to send data to the KDC. -func (cl *Client) sendToKDC(b []byte, realm string) ([]byte, error) { - var rb []byte - if cl.Config.LibDefaults.UDPPreferenceLimit == 1 { - //1 means we should always use TCP - rb, errtcp := cl.sendKDCTCP(realm, b) - if errtcp != nil { - if e, ok := errtcp.(messages.KRBError); ok { - return rb, e - } - return rb, fmt.Errorf("communication error with KDC via TCP: %v", errtcp) - } - return rb, nil - } - if len(b) <= cl.Config.LibDefaults.UDPPreferenceLimit { - //Try UDP first, TCP second - rb, errudp := cl.sendKDCUDP(realm, b) - if errudp != nil { - if e, ok := errudp.(messages.KRBError); ok && e.ErrorCode != errorcode.KRB_ERR_RESPONSE_TOO_BIG { - // Got a KRBError from KDC - // If this is not a KRB_ERR_RESPONSE_TOO_BIG we will return immediately otherwise will try TCP. - return rb, e - } - // Try TCP - r, errtcp := cl.sendKDCTCP(realm, b) - if errtcp != nil { - if e, ok := errtcp.(messages.KRBError); ok { - // Got a KRBError - return r, e - } - return r, fmt.Errorf("failed to communicate with KDC. Attempts made with UDP (%v) and then TCP (%v)", errudp, errtcp) - } - rb = r - } - return rb, nil - } - //Try TCP first, UDP second - rb, errtcp := cl.sendKDCTCP(realm, b) - if errtcp != nil { - if e, ok := errtcp.(messages.KRBError); ok { - // Got a KRBError from KDC so returning and not trying UDP. - return rb, e - } - rb, errudp := cl.sendKDCUDP(realm, b) - if errudp != nil { - if e, ok := errudp.(messages.KRBError); ok { - // Got a KRBError - return rb, e - } - return rb, fmt.Errorf("failed to communicate with KDC. Attempts made with TCP (%v) and then UDP (%v)", errtcp, errudp) - } - } - return rb, nil -} - -// dialKDCTCP establishes a UDP connection to a KDC. -func dialKDCUDP(count int, kdcs map[int]string) (*net.UDPConn, error) { - i := 1 - for i <= count { - udpAddr, err := net.ResolveUDPAddr("udp", kdcs[i]) - if err != nil { - return nil, fmt.Errorf("error resolving KDC address: %v", err) - } - - conn, err := net.DialTimeout("udp", udpAddr.String(), 5*time.Second) - if err == nil { - if err := conn.SetDeadline(time.Now().Add(5 * time.Second)); err != nil { - return nil, err - } - // conn is guaranteed to be a UDPConn - return conn.(*net.UDPConn), nil - } - i++ - } - return nil, errors.New("error in getting a UDP connection to any of the KDCs") -} - -// dialKDCTCP establishes a TCP connection to a KDC. -func dialKDCTCP(count int, kdcs map[int]string) (*net.TCPConn, error) { - i := 1 - for i <= count { - tcpAddr, err := net.ResolveTCPAddr("tcp", kdcs[i]) - if err != nil { - return nil, fmt.Errorf("error resolving KDC address: %v", err) - } - - conn, err := net.DialTimeout("tcp", tcpAddr.String(), 5*time.Second) - if err == nil { - if err := conn.SetDeadline(time.Now().Add(5 * time.Second)); err != nil { - return nil, err - } - // conn is guaranteed to be a TCPConn - return conn.(*net.TCPConn), nil - } - i++ - } - return nil, errors.New("error in getting a TCP connection to any of the KDCs") -} - -// sendKDCUDP sends bytes to the KDC via UDP. -func (cl *Client) sendKDCUDP(realm string, b []byte) ([]byte, error) { - var r []byte - count, kdcs, err := cl.Config.GetKDCs(realm, false) - if err != nil { - return r, err - } - conn, err := dialKDCUDP(count, kdcs) - if err != nil { - return r, err - } - r, err = cl.sendUDP(conn, b) - if err != nil { - return r, err - } - return checkForKRBError(r) -} - -// sendKDCTCP sends bytes to the KDC via TCP. -func (cl *Client) sendKDCTCP(realm string, b []byte) ([]byte, error) { - var r []byte - count, kdcs, err := cl.Config.GetKDCs(realm, true) - if err != nil { - return r, err - } - conn, err := dialKDCTCP(count, kdcs) - if err != nil { - return r, err - } - rb, err := cl.sendTCP(conn, b) - if err != nil { - return r, err - } - return checkForKRBError(rb) -} - -// sendUDP sends bytes to connection over UDP. -func (cl *Client) sendUDP(conn *net.UDPConn, b []byte) ([]byte, error) { - var r []byte - defer conn.Close() - _, err := conn.Write(b) - if err != nil { - return r, fmt.Errorf("error sending to (%s): %v", conn.RemoteAddr().String(), err) - } - udpbuf := make([]byte, 4096) - n, _, err := conn.ReadFrom(udpbuf) - r = udpbuf[:n] - if err != nil { - return r, fmt.Errorf("sending over UDP failed to %s: %v", conn.RemoteAddr().String(), err) - } - if len(r) < 1 { - return r, fmt.Errorf("no response data from %s", conn.RemoteAddr().String()) - } - return r, nil -} - -// sendTCP sends bytes to connection over TCP. -func (cl *Client) sendTCP(conn *net.TCPConn, b []byte) ([]byte, error) { - defer conn.Close() - var r []byte - // RFC 4120 7.2.2 specifies the first 4 bytes indicate the length of the message in big endian order. - var buf bytes.Buffer - err := binary.Write(&buf, binary.BigEndian, uint32(len(b))) - if err != nil { - return r, err - } - b = append(buf.Bytes(), b...) - - _, err = conn.Write(b) - if err != nil { - return r, fmt.Errorf("error sending to KDC (%s): %v", conn.RemoteAddr().String(), err) - } - - sh := make([]byte, 4, 4) - _, err = conn.Read(sh) - if err != nil { - return r, fmt.Errorf("error reading response size header: %v", err) - } - s := binary.BigEndian.Uint32(sh) - - rb := make([]byte, s, s) - _, err = io.ReadFull(conn, rb) - if err != nil { - return r, fmt.Errorf("error reading response: %v", err) - } - if len(rb) < 1 { - return r, fmt.Errorf("no response data from KDC %s", conn.RemoteAddr().String()) - } - return rb, nil -} - -// checkForKRBError checks if the response bytes from the KDC are a KRBError. -func checkForKRBError(b []byte) ([]byte, error) { - var KRBErr messages.KRBError - if err := KRBErr.Unmarshal(b); err == nil { - return b, KRBErr - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/passwd.go b/vendor/github.com/jcmturner/gokrb5/v8/client/passwd.go deleted file mode 100644 index 35069c7..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/passwd.go +++ /dev/null @@ -1,95 +0,0 @@ -package client - -import ( - "fmt" - "net" - - "github.com/jcmturner/gokrb5/v8/kadmin" - "github.com/jcmturner/gokrb5/v8/messages" -) - -// Kpasswd server response codes. -const ( - KRB5_KPASSWD_SUCCESS = 0 - KRB5_KPASSWD_MALFORMED = 1 - KRB5_KPASSWD_HARDERROR = 2 - KRB5_KPASSWD_AUTHERROR = 3 - KRB5_KPASSWD_SOFTERROR = 4 - KRB5_KPASSWD_ACCESSDENIED = 5 - KRB5_KPASSWD_BAD_VERSION = 6 - KRB5_KPASSWD_INITIAL_FLAG_NEEDED = 7 -) - -// ChangePasswd changes the password of the client to the value provided. -func (cl *Client) ChangePasswd(newPasswd string) (bool, error) { - ASReq, err := messages.NewASReqForChgPasswd(cl.Credentials.Domain(), cl.Config, cl.Credentials.CName()) - if err != nil { - return false, err - } - ASRep, err := cl.ASExchange(cl.Credentials.Domain(), ASReq, 0) - if err != nil { - return false, err - } - - msg, key, err := kadmin.ChangePasswdMsg(cl.Credentials.CName(), cl.Credentials.Domain(), newPasswd, ASRep.Ticket, ASRep.DecryptedEncPart.Key) - if err != nil { - return false, err - } - r, err := cl.sendToKPasswd(msg) - if err != nil { - return false, err - } - err = r.Decrypt(key) - if err != nil { - return false, err - } - if r.ResultCode != KRB5_KPASSWD_SUCCESS { - return false, fmt.Errorf("error response from kadmin: code: %d; result: %s; krberror: %v", r.ResultCode, r.Result, r.KRBError) - } - cl.Credentials.WithPassword(newPasswd) - return true, nil -} - -func (cl *Client) sendToKPasswd(msg kadmin.Request) (r kadmin.Reply, err error) { - _, kps, err := cl.Config.GetKpasswdServers(cl.Credentials.Domain(), true) - if err != nil { - return - } - addr := kps[1] - b, err := msg.Marshal() - if err != nil { - return - } - if len(b) <= cl.Config.LibDefaults.UDPPreferenceLimit { - return cl.sendKPasswdUDP(b, addr) - } - return cl.sendKPasswdTCP(b, addr) -} - -func (cl *Client) sendKPasswdTCP(b []byte, kadmindAddr string) (r kadmin.Reply, err error) { - tcpAddr, err := net.ResolveTCPAddr("tcp", kadmindAddr) - if err != nil { - return - } - conn, err := net.DialTCP("tcp", nil, tcpAddr) - if err != nil { - return - } - rb, err := cl.sendTCP(conn, b) - err = r.Unmarshal(rb) - return -} - -func (cl *Client) sendKPasswdUDP(b []byte, kadmindAddr string) (r kadmin.Reply, err error) { - udpAddr, err := net.ResolveUDPAddr("udp", kadmindAddr) - if err != nil { - return - } - conn, err := net.DialUDP("udp", nil, udpAddr) - if err != nil { - return - } - rb, err := cl.sendUDP(conn, b) - err = r.Unmarshal(rb) - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/session.go b/vendor/github.com/jcmturner/gokrb5/v8/client/session.go deleted file mode 100644 index f7654d0..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/session.go +++ /dev/null @@ -1,295 +0,0 @@ -package client - -import ( - "encoding/json" - "fmt" - "sort" - "strings" - "sync" - "time" - - "github.com/jcmturner/gokrb5/v8/iana/nametype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// sessions hold TGTs and are keyed on the realm name -type sessions struct { - Entries map[string]*session - mux sync.RWMutex -} - -// destroy erases all sessions -func (s *sessions) destroy() { - s.mux.Lock() - defer s.mux.Unlock() - for k, e := range s.Entries { - e.destroy() - delete(s.Entries, k) - } -} - -// update replaces a session with the one provided or adds it as a new one -func (s *sessions) update(sess *session) { - s.mux.Lock() - defer s.mux.Unlock() - // if a session already exists for this, cancel its auto renew. - if i, ok := s.Entries[sess.realm]; ok { - if i != sess { - // Session in the sessions cache is not the same as one provided. - // Cancel the one in the cache and add this one. - i.mux.Lock() - defer i.mux.Unlock() - i.cancel <- true - s.Entries[sess.realm] = sess - return - } - } - // No session for this realm was found so just add it - s.Entries[sess.realm] = sess -} - -// get returns the session for the realm specified -func (s *sessions) get(realm string) (*session, bool) { - s.mux.RLock() - defer s.mux.RUnlock() - sess, ok := s.Entries[realm] - return sess, ok -} - -// session holds the TGT details for a realm -type session struct { - realm string - authTime time.Time - endTime time.Time - renewTill time.Time - tgt messages.Ticket - sessionKey types.EncryptionKey - sessionKeyExpiration time.Time - cancel chan bool - mux sync.RWMutex -} - -// jsonSession is used to enable marshaling some information of a session in a JSON format -type jsonSession struct { - Realm string - AuthTime time.Time - EndTime time.Time - RenewTill time.Time - SessionKeyExpiration time.Time -} - -// AddSession adds a session for a realm with a TGT to the client's session cache. -// A goroutine is started to automatically renew the TGT before expiry. -func (cl *Client) addSession(tgt messages.Ticket, dep messages.EncKDCRepPart) { - if strings.ToLower(tgt.SName.NameString[0]) != "krbtgt" { - // Not a TGT - return - } - realm := tgt.SName.NameString[len(tgt.SName.NameString)-1] - s := &session{ - realm: realm, - authTime: dep.AuthTime, - endTime: dep.EndTime, - renewTill: dep.RenewTill, - tgt: tgt, - sessionKey: dep.Key, - sessionKeyExpiration: dep.KeyExpiration, - } - cl.sessions.update(s) - cl.enableAutoSessionRenewal(s) - cl.Log("TGT session added for %s (EndTime: %v)", realm, dep.EndTime) -} - -// update overwrites the session details with those from the TGT and decrypted encPart -func (s *session) update(tgt messages.Ticket, dep messages.EncKDCRepPart) { - s.mux.Lock() - defer s.mux.Unlock() - s.authTime = dep.AuthTime - s.endTime = dep.EndTime - s.renewTill = dep.RenewTill - s.tgt = tgt - s.sessionKey = dep.Key - s.sessionKeyExpiration = dep.KeyExpiration -} - -// destroy will cancel any auto renewal of the session and set the expiration times to the current time -func (s *session) destroy() { - s.mux.Lock() - defer s.mux.Unlock() - if s.cancel != nil { - s.cancel <- true - } - s.endTime = time.Now().UTC() - s.renewTill = s.endTime - s.sessionKeyExpiration = s.endTime -} - -// valid informs if the TGT is still within the valid time window -func (s *session) valid() bool { - s.mux.RLock() - defer s.mux.RUnlock() - t := time.Now().UTC() - if t.Before(s.endTime) && s.authTime.Before(t) { - return true - } - return false -} - -// tgtDetails is a thread safe way to get the session's realm, TGT and session key values -func (s *session) tgtDetails() (string, messages.Ticket, types.EncryptionKey) { - s.mux.RLock() - defer s.mux.RUnlock() - return s.realm, s.tgt, s.sessionKey -} - -// timeDetails is a thread safe way to get the session's validity time values -func (s *session) timeDetails() (string, time.Time, time.Time, time.Time, time.Time) { - s.mux.RLock() - defer s.mux.RUnlock() - return s.realm, s.authTime, s.endTime, s.renewTill, s.sessionKeyExpiration -} - -// JSON return information about the held sessions in a JSON format. -func (s *sessions) JSON() (string, error) { - s.mux.RLock() - defer s.mux.RUnlock() - var js []jsonSession - keys := make([]string, 0, len(s.Entries)) - for k := range s.Entries { - keys = append(keys, k) - } - sort.Strings(keys) - for _, k := range keys { - r, at, et, rt, kt := s.Entries[k].timeDetails() - j := jsonSession{ - Realm: r, - AuthTime: at, - EndTime: et, - RenewTill: rt, - SessionKeyExpiration: kt, - } - js = append(js, j) - } - b, err := json.MarshalIndent(js, "", " ") - if err != nil { - return "", err - } - return string(b), nil -} - -// enableAutoSessionRenewal turns on the automatic renewal for the client's TGT session. -func (cl *Client) enableAutoSessionRenewal(s *session) { - var timer *time.Timer - s.mux.Lock() - s.cancel = make(chan bool, 1) - s.mux.Unlock() - go func(s *session) { - for { - s.mux.RLock() - w := (s.endTime.Sub(time.Now().UTC()) * 5) / 6 - s.mux.RUnlock() - if w < 0 { - return - } - timer = time.NewTimer(w) - select { - case <-timer.C: - renewal, err := cl.refreshSession(s) - if err != nil { - cl.Log("error refreshing session: %v", err) - } - if !renewal && err == nil { - // end this goroutine as there will have been a new login and new auto renewal goroutine created. - return - } - case <-s.cancel: - // cancel has been called. Stop the timer and exit. - timer.Stop() - return - } - } - }(s) -} - -// renewTGT renews the client's TGT session. -func (cl *Client) renewTGT(s *session) error { - realm, tgt, skey := s.tgtDetails() - spn := types.PrincipalName{ - NameType: nametype.KRB_NT_SRV_INST, - NameString: []string{"krbtgt", realm}, - } - _, tgsRep, err := cl.TGSREQGenerateAndExchange(spn, cl.Credentials.Domain(), tgt, skey, true) - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "error renewing TGT for %s", realm) - } - s.update(tgsRep.Ticket, tgsRep.DecryptedEncPart) - cl.sessions.update(s) - cl.Log("TGT session renewed for %s (EndTime: %v)", realm, tgsRep.DecryptedEncPart.EndTime) - return nil -} - -// refreshSession updates either through renewal or creating a new login. -// The boolean indicates if the update was a renewal. -func (cl *Client) refreshSession(s *session) (bool, error) { - s.mux.RLock() - realm := s.realm - renewTill := s.renewTill - s.mux.RUnlock() - cl.Log("refreshing TGT session for %s", realm) - if time.Now().UTC().Before(renewTill) { - err := cl.renewTGT(s) - return true, err - } - err := cl.realmLogin(realm) - return false, err -} - -// ensureValidSession makes sure there is a valid session for the realm -func (cl *Client) ensureValidSession(realm string) error { - s, ok := cl.sessions.get(realm) - if ok { - s.mux.RLock() - d := s.endTime.Sub(s.authTime) / 6 - if s.endTime.Sub(time.Now().UTC()) > d { - s.mux.RUnlock() - return nil - } - s.mux.RUnlock() - _, err := cl.refreshSession(s) - return err - } - return cl.realmLogin(realm) -} - -// sessionTGTDetails is a thread safe way to get the TGT and session key values for a realm -func (cl *Client) sessionTGT(realm string) (tgt messages.Ticket, sessionKey types.EncryptionKey, err error) { - err = cl.ensureValidSession(realm) - if err != nil { - return - } - s, ok := cl.sessions.get(realm) - if !ok { - err = fmt.Errorf("could not find TGT session for %s", realm) - return - } - _, tgt, sessionKey = s.tgtDetails() - return -} - -// sessionTimes provides the timing information with regards to a session for the realm specified. -func (cl *Client) sessionTimes(realm string) (authTime, endTime, renewTime, sessionExp time.Time, err error) { - s, ok := cl.sessions.get(realm) - if !ok { - err = fmt.Errorf("could not find TGT session for %s", realm) - return - } - _, authTime, endTime, renewTime, sessionExp = s.timeDetails() - return -} - -// spnRealm resolves the realm name of a service principal name -func (cl *Client) spnRealm(spn types.PrincipalName) string { - return cl.Config.ResolveRealm(spn.NameString[len(spn.NameString)-1]) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/client/settings.go b/vendor/github.com/jcmturner/gokrb5/v8/client/settings.go deleted file mode 100644 index bcd3945..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/client/settings.go +++ /dev/null @@ -1,93 +0,0 @@ -package client - -import ( - "encoding/json" - "fmt" - "log" -) - -// Settings holds optional client settings. -type Settings struct { - disablePAFXFast bool - assumePreAuthentication bool - preAuthEType int32 - logger *log.Logger -} - -// jsonSettings is used when marshaling the Settings details to JSON format. -type jsonSettings struct { - DisablePAFXFast bool - AssumePreAuthentication bool -} - -// NewSettings creates a new client settings struct. -func NewSettings(settings ...func(*Settings)) *Settings { - s := new(Settings) - for _, set := range settings { - set(s) - } - return s -} - -// DisablePAFXFAST used to configure the client to not use PA_FX_FAST. -// -// s := NewSettings(DisablePAFXFAST(true)) -func DisablePAFXFAST(b bool) func(*Settings) { - return func(s *Settings) { - s.disablePAFXFast = b - } -} - -// DisablePAFXFAST indicates is the client should disable the use of PA_FX_FAST. -func (s *Settings) DisablePAFXFAST() bool { - return s.disablePAFXFast -} - -// AssumePreAuthentication used to configure the client to assume pre-authentication is required. -// -// s := NewSettings(AssumePreAuthentication(true)) -func AssumePreAuthentication(b bool) func(*Settings) { - return func(s *Settings) { - s.assumePreAuthentication = b - } -} - -// AssumePreAuthentication indicates if the client should proactively assume using pre-authentication. -func (s *Settings) AssumePreAuthentication() bool { - return s.assumePreAuthentication -} - -// Logger used to configure client with a logger. -// -// s := NewSettings(kt, Logger(l)) -func Logger(l *log.Logger) func(*Settings) { - return func(s *Settings) { - s.logger = l - } -} - -// Logger returns the client logger instance. -func (s *Settings) Logger() *log.Logger { - return s.logger -} - -// Log will write to the service's logger if it is configured. -func (cl *Client) Log(format string, v ...interface{}) { - if cl.settings.Logger() != nil { - cl.settings.Logger().Output(2, fmt.Sprintf(format, v...)) - } -} - -// JSON returns a JSON representation of the settings. -func (s *Settings) JSON() (string, error) { - js := jsonSettings{ - DisablePAFXFast: s.disablePAFXFast, - AssumePreAuthentication: s.assumePreAuthentication, - } - b, err := json.MarshalIndent(js, "", " ") - if err != nil { - return "", err - } - return string(b), nil - -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/config/error.go b/vendor/github.com/jcmturner/gokrb5/v8/config/error.go deleted file mode 100644 index 1fbda51..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/config/error.go +++ /dev/null @@ -1,30 +0,0 @@ -package config - -import "fmt" - -// UnsupportedDirective error. -type UnsupportedDirective struct { - text string -} - -// Error implements the error interface for unsupported directives. -func (e UnsupportedDirective) Error() string { - return e.text -} - -// Invalid config error. -type Invalid struct { - text string -} - -// Error implements the error interface for invalid config error. -func (e Invalid) Error() string { - return e.text -} - -// InvalidErrorf creates a new Invalid error. -func InvalidErrorf(format string, a ...interface{}) Invalid { - return Invalid{ - text: fmt.Sprintf("invalid krb5 config "+format, a...), - } -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/config/hosts.go b/vendor/github.com/jcmturner/gokrb5/v8/config/hosts.go deleted file mode 100644 index 3f22c70..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/config/hosts.go +++ /dev/null @@ -1,141 +0,0 @@ -package config - -import ( - "fmt" - "math/rand" - "net" - "strconv" - "strings" - - "github.com/jcmturner/dnsutils/v2" -) - -// GetKDCs returns the count of KDCs available and a map of KDC host names keyed on preference order. -func (c *Config) GetKDCs(realm string, tcp bool) (int, map[int]string, error) { - if realm == "" { - realm = c.LibDefaults.DefaultRealm - } - kdcs := make(map[int]string) - var count int - - // Get the KDCs from the krb5.conf. - var ks []string - for _, r := range c.Realms { - if r.Realm != realm { - continue - } - ks = r.KDC - } - count = len(ks) - - if count > 0 { - // Order the kdcs randomly for preference. - kdcs = randServOrder(ks) - return count, kdcs, nil - } - - if !c.LibDefaults.DNSLookupKDC { - return count, kdcs, fmt.Errorf("no KDCs defined in configuration for realm %s", realm) - } - - // Use DNS to resolve kerberos SRV records. - proto := "udp" - if tcp { - proto = "tcp" - } - index, addrs, err := dnsutils.OrderedSRV("kerberos", proto, realm) - if err != nil { - return count, kdcs, err - } - if len(addrs) < 1 { - return count, kdcs, fmt.Errorf("no KDC SRV records found for realm %s", realm) - } - count = index - for k, v := range addrs { - kdcs[k] = strings.TrimRight(v.Target, ".") + ":" + strconv.Itoa(int(v.Port)) - } - return count, kdcs, nil -} - -// GetKpasswdServers returns the count of kpasswd servers available and a map of kpasswd host names keyed on preference order. -// https://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/krb5_conf.html#realms - see kpasswd_server section -func (c *Config) GetKpasswdServers(realm string, tcp bool) (int, map[int]string, error) { - kdcs := make(map[int]string) - var count int - - // Use DNS to resolve kerberos SRV records if configured to do so in krb5.conf. - if c.LibDefaults.DNSLookupKDC { - proto := "udp" - if tcp { - proto = "tcp" - } - c, addrs, err := dnsutils.OrderedSRV("kpasswd", proto, realm) - if err != nil { - return count, kdcs, err - } - if c < 1 { - c, addrs, err = dnsutils.OrderedSRV("kerberos-adm", proto, realm) - if err != nil { - return count, kdcs, err - } - } - if len(addrs) < 1 { - return count, kdcs, fmt.Errorf("no kpasswd or kadmin SRV records found for realm %s", realm) - } - count = c - for k, v := range addrs { - kdcs[k] = strings.TrimRight(v.Target, ".") + ":" + strconv.Itoa(int(v.Port)) - } - } else { - // Get the KDCs from the krb5.conf an order them randomly for preference. - var ks []string - var ka []string - for _, r := range c.Realms { - if r.Realm == realm { - ks = r.KPasswdServer - ka = r.AdminServer - break - } - } - if len(ks) < 1 { - for _, k := range ka { - h, _, err := net.SplitHostPort(k) - if err != nil { - continue - } - ks = append(ks, h+":464") - } - } - count = len(ks) - if count < 1 { - return count, kdcs, fmt.Errorf("no kpasswd or kadmin defined in configuration for realm %s", realm) - } - kdcs = randServOrder(ks) - } - return count, kdcs, nil -} - -func randServOrder(ks []string) map[int]string { - kdcs := make(map[int]string) - count := len(ks) - i := 1 - if count > 1 { - l := len(ks) - for l > 0 { - ri := rand.Intn(l) - kdcs[i] = ks[ri] - if l > 1 { - // Remove the entry from the source slice by swapping with the last entry and truncating - ks[len(ks)-1], ks[ri] = ks[ri], ks[len(ks)-1] - ks = ks[:len(ks)-1] - l = len(ks) - } else { - l = 0 - } - i++ - } - } else { - kdcs[i] = ks[0] - } - return kdcs -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/config/krb5conf.go b/vendor/github.com/jcmturner/gokrb5/v8/config/krb5conf.go deleted file mode 100644 index a763843..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/config/krb5conf.go +++ /dev/null @@ -1,728 +0,0 @@ -// Package config implements KRB5 client and service configuration as described at https://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/krb5_conf.html -package config - -import ( - "bufio" - "encoding/hex" - "encoding/json" - "errors" - "fmt" - "io" - "net" - "os" - "os/user" - "regexp" - "strconv" - "strings" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// Config represents the KRB5 configuration. -type Config struct { - LibDefaults LibDefaults - Realms []Realm - DomainRealm DomainRealm - //CaPaths - //AppDefaults - //Plugins -} - -// WeakETypeList is a list of encryption types that have been deemed weak. -const WeakETypeList = "des-cbc-crc des-cbc-md4 des-cbc-md5 des-cbc-raw des3-cbc-raw des-hmac-sha1 arcfour-hmac-exp rc4-hmac-exp arcfour-hmac-md5-exp des" - -// New creates a new config struct instance. -func New() *Config { - d := make(DomainRealm) - return &Config{ - LibDefaults: newLibDefaults(), - DomainRealm: d, - } -} - -// LibDefaults represents the [libdefaults] section of the configuration. -type LibDefaults struct { - AllowWeakCrypto bool //default false - // ap_req_checksum_type int //unlikely to support this - Canonicalize bool //default false - CCacheType int //default is 4. unlikely to implement older - Clockskew time.Duration //max allowed skew in seconds, default 300 - //Default_ccache_name string // default /tmp/krb5cc_%{uid} //Not implementing as will hold in memory - DefaultClientKeytabName string //default /usr/local/var/krb5/user/%{euid}/client.keytab - DefaultKeytabName string //default /etc/krb5.keytab - DefaultRealm string - DefaultTGSEnctypes []string //default aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4 - DefaultTktEnctypes []string //default aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4 - DefaultTGSEnctypeIDs []int32 //default aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4 - DefaultTktEnctypeIDs []int32 //default aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4 - DNSCanonicalizeHostname bool //default true - DNSLookupKDC bool //default false - DNSLookupRealm bool - ExtraAddresses []net.IP //Not implementing yet - Forwardable bool //default false - IgnoreAcceptorHostname bool //default false - K5LoginAuthoritative bool //default false - K5LoginDirectory string //default user's home directory. Must be owned by the user or root - KDCDefaultOptions asn1.BitString //default 0x00000010 (KDC_OPT_RENEWABLE_OK) - KDCTimeSync int //default 1 - //kdc_req_checksum_type int //unlikely to implement as for very old KDCs - NoAddresses bool //default true - PermittedEnctypes []string //default aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4 - PermittedEnctypeIDs []int32 - //plugin_base_dir string //not supporting plugins - PreferredPreauthTypes []int //default “17, 16, 15, 14”, which forces libkrb5 to attempt to use PKINIT if it is supported - Proxiable bool //default false - RDNS bool //default true - RealmTryDomains int //default -1 - RenewLifetime time.Duration //default 0 - SafeChecksumType int //default 8 - TicketLifetime time.Duration //default 1 day - UDPPreferenceLimit int // 1 means to always use tcp. MIT krb5 has a default value of 1465, and it prevents user setting more than 32700. - VerifyAPReqNofail bool //default false -} - -// Create a new LibDefaults struct. -func newLibDefaults() LibDefaults { - uid := "0" - var hdir string - usr, _ := user.Current() - if usr != nil { - uid = usr.Uid - hdir = usr.HomeDir - } - opts := asn1.BitString{} - opts.Bytes, _ = hex.DecodeString("00000010") - opts.BitLength = len(opts.Bytes) * 8 - return LibDefaults{ - CCacheType: 4, - Clockskew: time.Duration(300) * time.Second, - DefaultClientKeytabName: fmt.Sprintf("/usr/local/var/krb5/user/%s/client.keytab", uid), - DefaultKeytabName: "/etc/krb5.keytab", - DefaultTGSEnctypes: []string{"aes256-cts-hmac-sha1-96", "aes128-cts-hmac-sha1-96", "des3-cbc-sha1", "arcfour-hmac-md5", "camellia256-cts-cmac", "camellia128-cts-cmac", "des-cbc-crc", "des-cbc-md5", "des-cbc-md4"}, - DefaultTktEnctypes: []string{"aes256-cts-hmac-sha1-96", "aes128-cts-hmac-sha1-96", "des3-cbc-sha1", "arcfour-hmac-md5", "camellia256-cts-cmac", "camellia128-cts-cmac", "des-cbc-crc", "des-cbc-md5", "des-cbc-md4"}, - DNSCanonicalizeHostname: true, - K5LoginDirectory: hdir, - KDCDefaultOptions: opts, - KDCTimeSync: 1, - NoAddresses: true, - PermittedEnctypes: []string{"aes256-cts-hmac-sha1-96", "aes128-cts-hmac-sha1-96", "des3-cbc-sha1", "arcfour-hmac-md5", "camellia256-cts-cmac", "camellia128-cts-cmac", "des-cbc-crc", "des-cbc-md5", "des-cbc-md4"}, - RDNS: true, - RealmTryDomains: -1, - SafeChecksumType: 8, - TicketLifetime: time.Duration(24) * time.Hour, - UDPPreferenceLimit: 1465, - PreferredPreauthTypes: []int{17, 16, 15, 14}, - } -} - -// Parse the lines of the [libdefaults] section of the configuration into the LibDefaults struct. -func (l *LibDefaults) parseLines(lines []string) error { - for _, line := range lines { - //Remove comments after the values - if idx := strings.IndexAny(line, "#;"); idx != -1 { - line = line[:idx] - } - line = strings.TrimSpace(line) - if line == "" { - continue - } - if !strings.Contains(line, "=") { - return InvalidErrorf("libdefaults section line (%s)", line) - } - - p := strings.Split(line, "=") - key := strings.TrimSpace(strings.ToLower(p[0])) - switch key { - case "allow_weak_crypto": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.AllowWeakCrypto = v - case "canonicalize": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.Canonicalize = v - case "ccache_type": - p[1] = strings.TrimSpace(p[1]) - v, err := strconv.ParseUint(p[1], 10, 32) - if err != nil || v < 0 || v > 4 { - return InvalidErrorf("libdefaults section line (%s)", line) - } - l.CCacheType = int(v) - case "clockskew": - d, err := parseDuration(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.Clockskew = d - case "default_client_keytab_name": - l.DefaultClientKeytabName = strings.TrimSpace(p[1]) - case "default_keytab_name": - l.DefaultKeytabName = strings.TrimSpace(p[1]) - case "default_realm": - l.DefaultRealm = strings.TrimSpace(p[1]) - case "default_tgs_enctypes": - l.DefaultTGSEnctypes = strings.Fields(p[1]) - case "default_tkt_enctypes": - l.DefaultTktEnctypes = strings.Fields(p[1]) - case "dns_canonicalize_hostname": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.DNSCanonicalizeHostname = v - case "dns_lookup_kdc": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.DNSLookupKDC = v - case "dns_lookup_realm": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.DNSLookupRealm = v - case "extra_addresses": - ipStr := strings.TrimSpace(p[1]) - for _, ip := range strings.Split(ipStr, ",") { - if eip := net.ParseIP(ip); eip != nil { - l.ExtraAddresses = append(l.ExtraAddresses, eip) - } - } - case "forwardable": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.Forwardable = v - case "ignore_acceptor_hostname": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.IgnoreAcceptorHostname = v - case "k5login_authoritative": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.K5LoginAuthoritative = v - case "k5login_directory": - l.K5LoginDirectory = strings.TrimSpace(p[1]) - case "kdc_default_options": - v := strings.TrimSpace(p[1]) - v = strings.Replace(v, "0x", "", -1) - b, err := hex.DecodeString(v) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.KDCDefaultOptions.Bytes = b - l.KDCDefaultOptions.BitLength = len(b) * 8 - case "kdc_timesync": - p[1] = strings.TrimSpace(p[1]) - v, err := strconv.ParseInt(p[1], 10, 32) - if err != nil || v < 0 { - return InvalidErrorf("libdefaults section line (%s)", line) - } - l.KDCTimeSync = int(v) - case "noaddresses": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.NoAddresses = v - case "permitted_enctypes": - l.PermittedEnctypes = strings.Fields(p[1]) - case "preferred_preauth_types": - p[1] = strings.TrimSpace(p[1]) - t := strings.Split(p[1], ",") - var v []int - for _, s := range t { - i, err := strconv.ParseInt(s, 10, 32) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - v = append(v, int(i)) - } - l.PreferredPreauthTypes = v - case "proxiable": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.Proxiable = v - case "rdns": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.RDNS = v - case "realm_try_domains": - p[1] = strings.TrimSpace(p[1]) - v, err := strconv.ParseInt(p[1], 10, 32) - if err != nil || v < -1 { - return InvalidErrorf("libdefaults section line (%s)", line) - } - l.RealmTryDomains = int(v) - case "renew_lifetime": - d, err := parseDuration(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.RenewLifetime = d - case "safe_checksum_type": - p[1] = strings.TrimSpace(p[1]) - v, err := strconv.ParseInt(p[1], 10, 32) - if err != nil || v < 0 { - return InvalidErrorf("libdefaults section line (%s)", line) - } - l.SafeChecksumType = int(v) - case "ticket_lifetime": - d, err := parseDuration(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.TicketLifetime = d - case "udp_preference_limit": - p[1] = strings.TrimSpace(p[1]) - v, err := strconv.ParseUint(p[1], 10, 32) - if err != nil || v > 32700 { - return InvalidErrorf("libdefaults section line (%s)", line) - } - l.UDPPreferenceLimit = int(v) - case "verify_ap_req_nofail": - v, err := parseBoolean(p[1]) - if err != nil { - return InvalidErrorf("libdefaults section line (%s): %v", line, err) - } - l.VerifyAPReqNofail = v - } - } - l.DefaultTGSEnctypeIDs = parseETypes(l.DefaultTGSEnctypes, l.AllowWeakCrypto) - l.DefaultTktEnctypeIDs = parseETypes(l.DefaultTktEnctypes, l.AllowWeakCrypto) - l.PermittedEnctypeIDs = parseETypes(l.PermittedEnctypes, l.AllowWeakCrypto) - return nil -} - -// Realm represents an entry in the [realms] section of the configuration. -type Realm struct { - Realm string - AdminServer []string - //auth_to_local //Not implementing for now - //auth_to_local_names //Not implementing for now - DefaultDomain string - KDC []string - KPasswdServer []string //default admin_server:464 - MasterKDC []string -} - -// Parse the lines of a [realms] entry into the Realm struct. -func (r *Realm) parseLines(name string, lines []string) (err error) { - r.Realm = name - var adminServerFinal bool - var KDCFinal bool - var kpasswdServerFinal bool - var masterKDCFinal bool - var ignore bool - var c int // counts the depth of blocks within brackets { } - for _, line := range lines { - if ignore && c > 0 && !strings.Contains(line, "{") && !strings.Contains(line, "}") { - continue - } - //Remove comments after the values - if idx := strings.IndexAny(line, "#;"); idx != -1 { - line = line[:idx] - } - line = strings.TrimSpace(line) - if line == "" { - continue - } - if !strings.Contains(line, "=") && !strings.Contains(line, "}") { - return InvalidErrorf("realms section line (%s)", line) - } - if strings.Contains(line, "v4_") { - ignore = true - err = UnsupportedDirective{"v4 configurations are not supported"} - } - if strings.Contains(line, "{") { - c++ - if ignore { - continue - } - } - if strings.Contains(line, "}") { - c-- - if c < 0 { - return InvalidErrorf("unpaired curly brackets") - } - if ignore { - if c < 1 { - c = 0 - ignore = false - } - continue - } - } - - p := strings.Split(line, "=") - key := strings.TrimSpace(strings.ToLower(p[0])) - v := strings.TrimSpace(p[1]) - switch key { - case "admin_server": - appendUntilFinal(&r.AdminServer, v, &adminServerFinal) - case "default_domain": - r.DefaultDomain = v - case "kdc": - if !strings.Contains(v, ":") { - // No port number specified default to 88 - if strings.HasSuffix(v, `*`) { - v = strings.TrimSpace(strings.TrimSuffix(v, `*`)) + ":88*" - } else { - v = strings.TrimSpace(v) + ":88" - } - } - appendUntilFinal(&r.KDC, v, &KDCFinal) - case "kpasswd_server": - appendUntilFinal(&r.KPasswdServer, v, &kpasswdServerFinal) - case "master_kdc": - appendUntilFinal(&r.MasterKDC, v, &masterKDCFinal) - } - } - //default for Kpasswd_server = admin_server:464 - if len(r.KPasswdServer) < 1 { - for _, a := range r.AdminServer { - s := strings.Split(a, ":") - r.KPasswdServer = append(r.KPasswdServer, s[0]+":464") - } - } - return -} - -// Parse the lines of the [realms] section of the configuration into an slice of Realm structs. -func parseRealms(lines []string) (realms []Realm, err error) { - var name string - var start int - var c int - for i, l := range lines { - //Remove comments after the values - if idx := strings.IndexAny(l, "#;"); idx != -1 { - l = l[:idx] - } - l = strings.TrimSpace(l) - if l == "" { - continue - } - //if strings.Contains(l, "v4_") { - // return nil, errors.New("v4 configurations are not supported in Realms section") - //} - if strings.Contains(l, "{") { - c++ - if !strings.Contains(l, "=") { - return nil, fmt.Errorf("realm configuration line invalid: %s", l) - } - if c == 1 { - start = i - p := strings.Split(l, "=") - name = strings.TrimSpace(p[0]) - } - } - if strings.Contains(l, "}") { - if c < 1 { - // but not started a block!!! - return nil, errors.New("invalid Realms section in configuration") - } - c-- - if c == 0 { - var r Realm - e := r.parseLines(name, lines[start+1:i]) - if e != nil { - if _, ok := e.(UnsupportedDirective); !ok { - err = e - return - } - err = e - } - realms = append(realms, r) - } - } - } - return -} - -// DomainRealm maps the domains to realms representing the [domain_realm] section of the configuration. -type DomainRealm map[string]string - -// Parse the lines of the [domain_realm] section of the configuration and add to the mapping. -func (d *DomainRealm) parseLines(lines []string) error { - for _, line := range lines { - //Remove comments after the values - if idx := strings.IndexAny(line, "#;"); idx != -1 { - line = line[:idx] - } - if strings.TrimSpace(line) == "" { - continue - } - if !strings.Contains(line, "=") { - return InvalidErrorf("realm line (%s)", line) - } - p := strings.Split(line, "=") - domain := strings.TrimSpace(strings.ToLower(p[0])) - realm := strings.TrimSpace(p[1]) - d.addMapping(domain, realm) - } - return nil -} - -// Add a domain to realm mapping. -func (d *DomainRealm) addMapping(domain, realm string) { - (*d)[domain] = realm -} - -// Delete a domain to realm mapping. -func (d *DomainRealm) deleteMapping(domain, realm string) { - delete(*d, domain) -} - -// ResolveRealm resolves the kerberos realm for the specified domain name from the domain to realm mapping. -// The most specific mapping is returned. -func (c *Config) ResolveRealm(domainName string) string { - domainName = strings.TrimSuffix(domainName, ".") - - // Try to match the entire hostname first - if r, ok := c.DomainRealm[domainName]; ok { - return r - } - - // Try to match all DNS domain parts - periods := strings.Count(domainName, ".") + 1 - for i := 2; i <= periods; i++ { - z := strings.SplitN(domainName, ".", i) - if r, ok := c.DomainRealm["."+z[len(z)-1]]; ok { - return r - } - } - return c.LibDefaults.DefaultRealm -} - -// Load the KRB5 configuration from the specified file path. -func Load(cfgPath string) (*Config, error) { - fh, err := os.Open(cfgPath) - if err != nil { - return nil, errors.New("configuration file could not be opened: " + cfgPath + " " + err.Error()) - } - defer fh.Close() - scanner := bufio.NewScanner(fh) - return NewFromScanner(scanner) -} - -// NewFromString creates a new Config struct from a string. -func NewFromString(s string) (*Config, error) { - reader := strings.NewReader(s) - return NewFromReader(reader) -} - -// NewFromReader creates a new Config struct from an io.Reader. -func NewFromReader(r io.Reader) (*Config, error) { - scanner := bufio.NewScanner(r) - return NewFromScanner(scanner) -} - -// NewFromScanner creates a new Config struct from a bufio.Scanner. -func NewFromScanner(scanner *bufio.Scanner) (*Config, error) { - c := New() - var e error - sections := make(map[int]string) - var sectionLineNum []int - var lines []string - for scanner.Scan() { - // Skip comments and blank lines - if matched, _ := regexp.MatchString(`^\s*(#|;|\n)`, scanner.Text()); matched { - continue - } - if matched, _ := regexp.MatchString(`^\s*\[libdefaults\]\s*`, scanner.Text()); matched { - sections[len(lines)] = "libdefaults" - sectionLineNum = append(sectionLineNum, len(lines)) - continue - } - if matched, _ := regexp.MatchString(`^\s*\[realms\]\s*`, scanner.Text()); matched { - sections[len(lines)] = "realms" - sectionLineNum = append(sectionLineNum, len(lines)) - continue - } - if matched, _ := regexp.MatchString(`^\s*\[domain_realm\]\s*`, scanner.Text()); matched { - sections[len(lines)] = "domain_realm" - sectionLineNum = append(sectionLineNum, len(lines)) - continue - } - if matched, _ := regexp.MatchString(`^\s*\[.*\]\s*`, scanner.Text()); matched { - sections[len(lines)] = "unknown_section" - sectionLineNum = append(sectionLineNum, len(lines)) - continue - } - lines = append(lines, scanner.Text()) - } - for i, start := range sectionLineNum { - var end int - if i+1 >= len(sectionLineNum) { - end = len(lines) - } else { - end = sectionLineNum[i+1] - } - switch section := sections[start]; section { - case "libdefaults": - err := c.LibDefaults.parseLines(lines[start:end]) - if err != nil { - if _, ok := err.(UnsupportedDirective); !ok { - return nil, fmt.Errorf("error processing libdefaults section: %v", err) - } - e = err - } - case "realms": - realms, err := parseRealms(lines[start:end]) - if err != nil { - if _, ok := err.(UnsupportedDirective); !ok { - return nil, fmt.Errorf("error processing realms section: %v", err) - } - e = err - } - c.Realms = realms - case "domain_realm": - err := c.DomainRealm.parseLines(lines[start:end]) - if err != nil { - if _, ok := err.(UnsupportedDirective); !ok { - return nil, fmt.Errorf("error processing domaain_realm section: %v", err) - } - e = err - } - } - } - return c, e -} - -// Parse a space delimited list of ETypes into a list of EType numbers optionally filtering out weak ETypes. -func parseETypes(s []string, w bool) []int32 { - var eti []int32 - for _, et := range s { - if !w { - var weak bool - for _, wet := range strings.Fields(WeakETypeList) { - if et == wet { - weak = true - break - } - } - if weak { - continue - } - } - i := etypeID.EtypeSupported(et) - if i != 0 { - eti = append(eti, i) - } - } - return eti -} - -// Parse a time duration string in the configuration to a golang time.Duration. -func parseDuration(s string) (time.Duration, error) { - s = strings.Replace(strings.TrimSpace(s), " ", "", -1) - - // handle Nd[NmNs] - if strings.Contains(s, "d") { - ds := strings.SplitN(s, "d", 2) - dn, err := strconv.ParseUint(ds[0], 10, 32) - if err != nil { - return time.Duration(0), errors.New("invalid time duration") - } - d := time.Duration(dn*24) * time.Hour - if ds[1] != "" { - dp, err := time.ParseDuration(ds[1]) - if err != nil { - return time.Duration(0), errors.New("invalid time duration") - } - d = d + dp - } - return d, nil - } - - // handle Nm[Ns] - d, err := time.ParseDuration(s) - if err == nil { - return d, nil - } - - // handle N - v, err := strconv.ParseUint(s, 10, 32) - if err == nil && v > 0 { - return time.Duration(v) * time.Second, nil - } - - // handle h:m[:s] - if strings.Contains(s, ":") { - t := strings.Split(s, ":") - if 2 > len(t) || len(t) > 3 { - return time.Duration(0), errors.New("invalid time duration value") - } - var i []int - for _, n := range t { - j, err := strconv.ParseInt(n, 10, 16) - if err != nil { - return time.Duration(0), errors.New("invalid time duration value") - } - i = append(i, int(j)) - } - d := time.Duration(i[0])*time.Hour + time.Duration(i[1])*time.Minute - if len(i) == 3 { - d = d + time.Duration(i[2])*time.Second - } - return d, nil - } - return time.Duration(0), errors.New("invalid time duration value") -} - -// Parse possible boolean values to golang bool. -func parseBoolean(s string) (bool, error) { - s = strings.TrimSpace(s) - v, err := strconv.ParseBool(s) - if err == nil { - return v, nil - } - switch strings.ToLower(s) { - case "yes": - return true, nil - case "y": - return true, nil - case "no": - return false, nil - case "n": - return false, nil - } - return false, errors.New("invalid boolean value") -} - -// Parse array of strings but stop if an asterisk is placed at the end of a line. -func appendUntilFinal(s *[]string, value string, final *bool) { - if *final { - return - } - if last := len(value) - 1; last >= 0 && value[last] == '*' { - *final = true - value = value[:len(value)-1] - } - *s = append(*s, value) -} - -// JSON return details of the config in a JSON format. -func (c *Config) JSON() (string, error) { - b, err := json.MarshalIndent(c, "", " ") - if err != nil { - return "", err - } - return string(b), nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/credentials/ccache.go b/vendor/github.com/jcmturner/gokrb5/v8/credentials/ccache.go deleted file mode 100644 index c3b35c7..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/credentials/ccache.go +++ /dev/null @@ -1,333 +0,0 @@ -package credentials - -import ( - "bytes" - "encoding/binary" - "errors" - "io/ioutil" - "strings" - "time" - "unsafe" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/types" -) - -const ( - headerFieldTagKDCOffset = 1 -) - -// CCache is the file credentials cache as define here: https://web.mit.edu/kerberos/krb5-latest/doc/formats/ccache_file_format.html -type CCache struct { - Version uint8 - Header header - DefaultPrincipal principal - Credentials []*Credential - Path string -} - -type header struct { - length uint16 - fields []headerField -} - -type headerField struct { - tag uint16 - length uint16 - value []byte -} - -// Credential cache entry principal struct. -type principal struct { - Realm string - PrincipalName types.PrincipalName -} - -// Credential holds a Kerberos client's ccache credential information. -type Credential struct { - Client principal - Server principal - Key types.EncryptionKey - AuthTime time.Time - StartTime time.Time - EndTime time.Time - RenewTill time.Time - IsSKey bool - TicketFlags asn1.BitString - Addresses []types.HostAddress - AuthData []types.AuthorizationDataEntry - Ticket []byte - SecondTicket []byte -} - -// LoadCCache loads a credential cache file into a CCache type. -func LoadCCache(cpath string) (*CCache, error) { - c := new(CCache) - b, err := ioutil.ReadFile(cpath) - if err != nil { - return c, err - } - err = c.Unmarshal(b) - return c, err -} - -// Unmarshal a byte slice of credential cache data into CCache type. -func (c *CCache) Unmarshal(b []byte) error { - p := 0 - //The first byte of the file always has the value 5 - if int8(b[p]) != 5 { - return errors.New("Invalid credential cache data. First byte does not equal 5") - } - p++ - //Get credential cache version - //The second byte contains the version number (1 to 4) - c.Version = b[p] - if c.Version < 1 || c.Version > 4 { - return errors.New("Invalid credential cache data. Keytab version is not within 1 to 4") - } - p++ - //Version 1 or 2 of the file format uses native byte order for integer representations. Versions 3 & 4 always uses big-endian byte order - var endian binary.ByteOrder - endian = binary.BigEndian - if (c.Version == 1 || c.Version == 2) && isNativeEndianLittle() { - endian = binary.LittleEndian - } - if c.Version == 4 { - err := parseHeader(b, &p, c, &endian) - if err != nil { - return err - } - } - c.DefaultPrincipal = parsePrincipal(b, &p, c, &endian) - for p < len(b) { - cred, err := parseCredential(b, &p, c, &endian) - if err != nil { - return err - } - c.Credentials = append(c.Credentials, cred) - } - return nil -} - -func parseHeader(b []byte, p *int, c *CCache, e *binary.ByteOrder) error { - if c.Version != 4 { - return errors.New("Credentials cache version is not 4 so there is no header to parse.") - } - h := header{} - h.length = uint16(readInt16(b, p, e)) - for *p <= int(h.length) { - f := headerField{} - f.tag = uint16(readInt16(b, p, e)) - f.length = uint16(readInt16(b, p, e)) - f.value = b[*p : *p+int(f.length)] - *p += int(f.length) - if !f.valid() { - return errors.New("Invalid credential cache header found") - } - h.fields = append(h.fields, f) - } - c.Header = h - return nil -} - -// Parse the Keytab bytes of a principal into a Keytab entry's principal. -func parsePrincipal(b []byte, p *int, c *CCache, e *binary.ByteOrder) (princ principal) { - if c.Version != 1 { - //Name Type is omitted in version 1 - princ.PrincipalName.NameType = readInt32(b, p, e) - } - nc := int(readInt32(b, p, e)) - if c.Version == 1 { - //In version 1 the number of components includes the realm. Minus 1 to make consistent with version 2 - nc-- - } - lenRealm := readInt32(b, p, e) - princ.Realm = string(readBytes(b, p, int(lenRealm), e)) - for i := 0; i < nc; i++ { - l := readInt32(b, p, e) - princ.PrincipalName.NameString = append(princ.PrincipalName.NameString, string(readBytes(b, p, int(l), e))) - } - return princ -} - -func parseCredential(b []byte, p *int, c *CCache, e *binary.ByteOrder) (cred *Credential, err error) { - cred = new(Credential) - cred.Client = parsePrincipal(b, p, c, e) - cred.Server = parsePrincipal(b, p, c, e) - key := types.EncryptionKey{} - key.KeyType = int32(readInt16(b, p, e)) - if c.Version == 3 { - //repeated twice in version 3 - key.KeyType = int32(readInt16(b, p, e)) - } - key.KeyValue = readData(b, p, e) - cred.Key = key - cred.AuthTime = readTimestamp(b, p, e) - cred.StartTime = readTimestamp(b, p, e) - cred.EndTime = readTimestamp(b, p, e) - cred.RenewTill = readTimestamp(b, p, e) - if ik := readInt8(b, p, e); ik == 0 { - cred.IsSKey = false - } else { - cred.IsSKey = true - } - cred.TicketFlags = types.NewKrbFlags() - cred.TicketFlags.Bytes = readBytes(b, p, 4, e) - l := int(readInt32(b, p, e)) - cred.Addresses = make([]types.HostAddress, l, l) - for i := range cred.Addresses { - cred.Addresses[i] = readAddress(b, p, e) - } - l = int(readInt32(b, p, e)) - cred.AuthData = make([]types.AuthorizationDataEntry, l, l) - for i := range cred.AuthData { - cred.AuthData[i] = readAuthDataEntry(b, p, e) - } - cred.Ticket = readData(b, p, e) - cred.SecondTicket = readData(b, p, e) - return -} - -// GetClientPrincipalName returns a PrincipalName type for the client the credentials cache is for. -func (c *CCache) GetClientPrincipalName() types.PrincipalName { - return c.DefaultPrincipal.PrincipalName -} - -// GetClientRealm returns the reals of the client the credentials cache is for. -func (c *CCache) GetClientRealm() string { - return c.DefaultPrincipal.Realm -} - -// GetClientCredentials returns a Credentials object representing the client of the credentials cache. -func (c *CCache) GetClientCredentials() *Credentials { - return &Credentials{ - username: c.DefaultPrincipal.PrincipalName.PrincipalNameString(), - realm: c.GetClientRealm(), - cname: c.DefaultPrincipal.PrincipalName, - } -} - -// Contains tests if the cache contains a credential for the provided server PrincipalName -func (c *CCache) Contains(p types.PrincipalName) bool { - for _, cred := range c.Credentials { - if cred.Server.PrincipalName.Equal(p) { - return true - } - } - return false -} - -// GetEntry returns a specific credential for the PrincipalName provided. -func (c *CCache) GetEntry(p types.PrincipalName) (*Credential, bool) { - cred := new(Credential) - var found bool - for i := range c.Credentials { - if c.Credentials[i].Server.PrincipalName.Equal(p) { - cred = c.Credentials[i] - found = true - break - } - } - if !found { - return cred, false - } - return cred, true -} - -// GetEntries filters out configuration entries an returns a slice of credentials. -func (c *CCache) GetEntries() []*Credential { - creds := make([]*Credential, 0) - for _, cred := range c.Credentials { - // Filter out configuration entries - if strings.HasPrefix(cred.Server.Realm, "X-CACHECONF") { - continue - } - creds = append(creds, cred) - } - return creds -} - -func (h *headerField) valid() bool { - // See https://web.mit.edu/kerberos/krb5-latest/doc/formats/ccache_file_format.html - Header format - switch h.tag { - case headerFieldTagKDCOffset: - if h.length != 8 || len(h.value) != 8 { - return false - } - return true - } - return false -} - -func readData(b []byte, p *int, e *binary.ByteOrder) []byte { - l := readInt32(b, p, e) - return readBytes(b, p, int(l), e) -} - -func readAddress(b []byte, p *int, e *binary.ByteOrder) types.HostAddress { - a := types.HostAddress{} - a.AddrType = int32(readInt16(b, p, e)) - a.Address = readData(b, p, e) - return a -} - -func readAuthDataEntry(b []byte, p *int, e *binary.ByteOrder) types.AuthorizationDataEntry { - a := types.AuthorizationDataEntry{} - a.ADType = int32(readInt16(b, p, e)) - a.ADData = readData(b, p, e) - return a -} - -// Read bytes representing a timestamp. -func readTimestamp(b []byte, p *int, e *binary.ByteOrder) time.Time { - return time.Unix(int64(readInt32(b, p, e)), 0) -} - -// Read bytes representing an eight bit integer. -func readInt8(b []byte, p *int, e *binary.ByteOrder) (i int8) { - buf := bytes.NewBuffer(b[*p : *p+1]) - binary.Read(buf, *e, &i) - *p++ - return -} - -// Read bytes representing a sixteen bit integer. -func readInt16(b []byte, p *int, e *binary.ByteOrder) (i int16) { - buf := bytes.NewBuffer(b[*p : *p+2]) - binary.Read(buf, *e, &i) - *p += 2 - return -} - -// Read bytes representing a thirty two bit integer. -func readInt32(b []byte, p *int, e *binary.ByteOrder) (i int32) { - buf := bytes.NewBuffer(b[*p : *p+4]) - binary.Read(buf, *e, &i) - *p += 4 - return -} - -func readBytes(b []byte, p *int, s int, e *binary.ByteOrder) []byte { - buf := bytes.NewBuffer(b[*p : *p+s]) - r := make([]byte, s) - binary.Read(buf, *e, &r) - *p += s - return r -} - -func isNativeEndianLittle() bool { - var x = 0x012345678 - var p = unsafe.Pointer(&x) - var bp = (*[4]byte)(p) - - var endian bool - if 0x01 == bp[0] { - endian = false - } else if (0x78 & 0xff) == (bp[0] & 0xff) { - endian = true - } else { - // Default to big endian - endian = false - } - return endian -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/credentials/credentials.go b/vendor/github.com/jcmturner/gokrb5/v8/credentials/credentials.go deleted file mode 100644 index bddbc7e..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/credentials/credentials.go +++ /dev/null @@ -1,405 +0,0 @@ -// Package credentials provides credentials management for Kerberos 5 authentication. -package credentials - -import ( - "bytes" - "encoding/gob" - "encoding/json" - "time" - - "github.com/hashicorp/go-uuid" - "github.com/jcmturner/gokrb5/v8/iana/nametype" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/types" -) - -const ( - // AttributeKeyADCredentials assigned number for AD credentials. - AttributeKeyADCredentials = "gokrb5AttributeKeyADCredentials" -) - -// Credentials struct for a user. -// Contains either a keytab, password or both. -// Keytabs are used over passwords if both are defined. -type Credentials struct { - username string - displayName string - realm string - cname types.PrincipalName - keytab *keytab.Keytab - password string - attributes map[string]interface{} - validUntil time.Time - authenticated bool - human bool - authTime time.Time - groupMembership map[string]bool - sessionID string -} - -// marshalCredentials is used to enable marshaling and unmarshaling of credentials -// without having exported fields on the Credentials struct -type marshalCredentials struct { - Username string - DisplayName string - Realm string - CName types.PrincipalName `json:"-"` - Keytab bool - Password bool - Attributes map[string]interface{} `json:"-"` - ValidUntil time.Time - Authenticated bool - Human bool - AuthTime time.Time - GroupMembership map[string]bool `json:"-"` - SessionID string -} - -// ADCredentials contains information obtained from the PAC. -type ADCredentials struct { - EffectiveName string - FullName string - UserID int - PrimaryGroupID int - LogOnTime time.Time - LogOffTime time.Time - PasswordLastSet time.Time - GroupMembershipSIDs []string - LogonDomainName string - LogonDomainID string - LogonServer string -} - -// New creates a new Credentials instance. -func New(username string, realm string) *Credentials { - uid, err := uuid.GenerateUUID() - if err != nil { - uid = "00unique-sess-ions-uuid-unavailable0" - } - return &Credentials{ - username: username, - displayName: username, - realm: realm, - cname: types.NewPrincipalName(nametype.KRB_NT_PRINCIPAL, username), - keytab: keytab.New(), - attributes: make(map[string]interface{}), - groupMembership: make(map[string]bool), - sessionID: uid, - human: true, - } -} - -// NewFromPrincipalName creates a new Credentials instance with the user details provides as a PrincipalName type. -func NewFromPrincipalName(cname types.PrincipalName, realm string) *Credentials { - c := New(cname.PrincipalNameString(), realm) - c.cname = cname - return c -} - -// WithKeytab sets the Keytab in the Credentials struct. -func (c *Credentials) WithKeytab(kt *keytab.Keytab) *Credentials { - c.keytab = kt - c.password = "" - return c -} - -// Keytab returns the credential's Keytab. -func (c *Credentials) Keytab() *keytab.Keytab { - return c.keytab -} - -// HasKeytab queries if the Credentials has a keytab defined. -func (c *Credentials) HasKeytab() bool { - if c.keytab != nil && len(c.keytab.Entries) > 0 { - return true - } - return false -} - -// WithPassword sets the password in the Credentials struct. -func (c *Credentials) WithPassword(password string) *Credentials { - c.password = password - c.keytab = keytab.New() // clear any keytab - return c -} - -// Password returns the credential's password. -func (c *Credentials) Password() string { - return c.password -} - -// HasPassword queries if the Credentials has a password defined. -func (c *Credentials) HasPassword() bool { - if c.password != "" { - return true - } - return false -} - -// SetValidUntil sets the expiry time of the credentials -func (c *Credentials) SetValidUntil(t time.Time) { - c.validUntil = t -} - -// SetADCredentials adds ADCredentials attributes to the credentials -func (c *Credentials) SetADCredentials(a ADCredentials) { - c.SetAttribute(AttributeKeyADCredentials, a) - if a.FullName != "" { - c.SetDisplayName(a.FullName) - } - if a.EffectiveName != "" { - c.SetUserName(a.EffectiveName) - } - for i := range a.GroupMembershipSIDs { - c.AddAuthzAttribute(a.GroupMembershipSIDs[i]) - } -} - -// GetADCredentials returns ADCredentials attributes sorted in the credential -func (c *Credentials) GetADCredentials() ADCredentials { - if a, ok := c.attributes[AttributeKeyADCredentials].(ADCredentials); ok { - return a - } - return ADCredentials{} -} - -// Methods to implement goidentity.Identity interface - -// UserName returns the credential's username. -func (c *Credentials) UserName() string { - return c.username -} - -// SetUserName sets the username value on the credential. -func (c *Credentials) SetUserName(s string) { - c.username = s -} - -// CName returns the credential's client principal name. -func (c *Credentials) CName() types.PrincipalName { - return c.cname -} - -// SetCName sets the client principal name on the credential. -func (c *Credentials) SetCName(pn types.PrincipalName) { - c.cname = pn -} - -// Domain returns the credential's domain. -func (c *Credentials) Domain() string { - return c.realm -} - -// SetDomain sets the domain value on the credential. -func (c *Credentials) SetDomain(s string) { - c.realm = s -} - -// Realm returns the credential's realm. Same as the domain. -func (c *Credentials) Realm() string { - return c.Domain() -} - -// SetRealm sets the realm value on the credential. Same as the domain -func (c *Credentials) SetRealm(s string) { - c.SetDomain(s) -} - -// DisplayName returns the credential's display name. -func (c *Credentials) DisplayName() string { - return c.displayName -} - -// SetDisplayName sets the display name value on the credential. -func (c *Credentials) SetDisplayName(s string) { - c.displayName = s -} - -// Human returns if the credential represents a human or not. -func (c *Credentials) Human() bool { - return c.human -} - -// SetHuman sets the credential as human. -func (c *Credentials) SetHuman(b bool) { - c.human = b -} - -// AuthTime returns the time the credential was authenticated. -func (c *Credentials) AuthTime() time.Time { - return c.authTime -} - -// SetAuthTime sets the time the credential was authenticated. -func (c *Credentials) SetAuthTime(t time.Time) { - c.authTime = t -} - -// AuthzAttributes returns the credentials authorizing attributes. -func (c *Credentials) AuthzAttributes() []string { - s := make([]string, len(c.groupMembership)) - i := 0 - for a := range c.groupMembership { - s[i] = a - i++ - } - return s -} - -// Authenticated indicates if the credential has been successfully authenticated or not. -func (c *Credentials) Authenticated() bool { - return c.authenticated -} - -// SetAuthenticated sets the credential as having been successfully authenticated. -func (c *Credentials) SetAuthenticated(b bool) { - c.authenticated = b -} - -// AddAuthzAttribute adds an authorization attribute to the credential. -func (c *Credentials) AddAuthzAttribute(a string) { - c.groupMembership[a] = true -} - -// RemoveAuthzAttribute removes an authorization attribute from the credential. -func (c *Credentials) RemoveAuthzAttribute(a string) { - if _, ok := c.groupMembership[a]; !ok { - return - } - delete(c.groupMembership, a) -} - -// EnableAuthzAttribute toggles an authorization attribute to an enabled state on the credential. -func (c *Credentials) EnableAuthzAttribute(a string) { - if enabled, ok := c.groupMembership[a]; ok && !enabled { - c.groupMembership[a] = true - } -} - -// DisableAuthzAttribute toggles an authorization attribute to a disabled state on the credential. -func (c *Credentials) DisableAuthzAttribute(a string) { - if enabled, ok := c.groupMembership[a]; ok && enabled { - c.groupMembership[a] = false - } -} - -// Authorized indicates if the credential has the specified authorizing attribute. -func (c *Credentials) Authorized(a string) bool { - if enabled, ok := c.groupMembership[a]; ok && enabled { - return true - } - return false -} - -// SessionID returns the credential's session ID. -func (c *Credentials) SessionID() string { - return c.sessionID -} - -// Expired indicates if the credential has expired. -func (c *Credentials) Expired() bool { - if !c.validUntil.IsZero() && time.Now().UTC().After(c.validUntil) { - return true - } - return false -} - -// ValidUntil returns the credential's valid until date -func (c *Credentials) ValidUntil() time.Time { - return c.validUntil -} - -// Attributes returns the Credentials' attributes map. -func (c *Credentials) Attributes() map[string]interface{} { - return c.attributes -} - -// SetAttribute sets the value of an attribute. -func (c *Credentials) SetAttribute(k string, v interface{}) { - c.attributes[k] = v -} - -// SetAttributes replaces the attributes map with the one provided. -func (c *Credentials) SetAttributes(a map[string]interface{}) { - c.attributes = a -} - -// RemoveAttribute deletes an attribute from the attribute map that has the key provided. -func (c *Credentials) RemoveAttribute(k string) { - delete(c.attributes, k) -} - -// Marshal the Credentials into a byte slice -func (c *Credentials) Marshal() ([]byte, error) { - gob.Register(map[string]interface{}{}) - gob.Register(ADCredentials{}) - buf := new(bytes.Buffer) - enc := gob.NewEncoder(buf) - mc := marshalCredentials{ - Username: c.username, - DisplayName: c.displayName, - Realm: c.realm, - CName: c.cname, - Keytab: c.HasKeytab(), - Password: c.HasPassword(), - Attributes: c.attributes, - ValidUntil: c.validUntil, - Authenticated: c.authenticated, - Human: c.human, - AuthTime: c.authTime, - GroupMembership: c.groupMembership, - SessionID: c.sessionID, - } - err := enc.Encode(&mc) - if err != nil { - return []byte{}, err - } - return buf.Bytes(), nil -} - -// Unmarshal a byte slice into Credentials -func (c *Credentials) Unmarshal(b []byte) error { - gob.Register(map[string]interface{}{}) - gob.Register(ADCredentials{}) - mc := new(marshalCredentials) - buf := bytes.NewBuffer(b) - dec := gob.NewDecoder(buf) - err := dec.Decode(mc) - if err != nil { - return err - } - c.username = mc.Username - c.displayName = mc.DisplayName - c.realm = mc.Realm - c.cname = mc.CName - c.attributes = mc.Attributes - c.validUntil = mc.ValidUntil - c.authenticated = mc.Authenticated - c.human = mc.Human - c.authTime = mc.AuthTime - c.groupMembership = mc.GroupMembership - c.sessionID = mc.SessionID - return nil -} - -// JSON return details of the Credentials in a JSON format. -func (c *Credentials) JSON() (string, error) { - mc := marshalCredentials{ - Username: c.username, - DisplayName: c.displayName, - Realm: c.realm, - CName: c.cname, - Keytab: c.HasKeytab(), - Password: c.HasPassword(), - ValidUntil: c.validUntil, - Authenticated: c.authenticated, - Human: c.human, - AuthTime: c.authTime, - SessionID: c.sessionID, - } - b, err := json.MarshalIndent(mc, "", " ") - if err != nil { - return "", err - } - return string(b), nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha1-96.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha1-96.go deleted file mode 100644 index dd8babd..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha1-96.go +++ /dev/null @@ -1,129 +0,0 @@ -package crypto - -import ( - "crypto/aes" - "crypto/hmac" - "crypto/sha1" - "hash" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/rfc3961" - "github.com/jcmturner/gokrb5/v8/crypto/rfc3962" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// RFC 3962 - -// Aes128CtsHmacSha96 implements Kerberos encryption type aes128-cts-hmac-sha1-96 -type Aes128CtsHmacSha96 struct { -} - -// GetETypeID returns the EType ID number. -func (e Aes128CtsHmacSha96) GetETypeID() int32 { - return etypeID.AES128_CTS_HMAC_SHA1_96 -} - -// GetHashID returns the checksum type ID number. -func (e Aes128CtsHmacSha96) GetHashID() int32 { - return chksumtype.HMAC_SHA1_96_AES128 -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e Aes128CtsHmacSha96) GetKeyByteSize() int { - return 128 / 8 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e Aes128CtsHmacSha96) GetKeySeedBitLength() int { - return e.GetKeyByteSize() * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e Aes128CtsHmacSha96) GetHashFunc() func() hash.Hash { - return sha1.New -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e Aes128CtsHmacSha96) GetMessageBlockByteSize() int { - return 1 -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e Aes128CtsHmacSha96) GetDefaultStringToKeyParams() string { - return "00001000" -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e Aes128CtsHmacSha96) GetConfounderByteSize() int { - return aes.BlockSize -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e Aes128CtsHmacSha96) GetHMACBitLength() int { - return 96 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e Aes128CtsHmacSha96) GetCypherBlockBitLength() int { - return aes.BlockSize * 8 -} - -// StringToKey returns a key derived from the string provided. -func (e Aes128CtsHmacSha96) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - return rfc3962.StringToKey(secret, salt, s2kparams, e) -} - -// RandomToKey returns a key from the bytes provided. -func (e Aes128CtsHmacSha96) RandomToKey(b []byte) []byte { - return rfc3961.RandomToKey(b) -} - -// EncryptData encrypts the data provided. -func (e Aes128CtsHmacSha96) EncryptData(key, data []byte) ([]byte, []byte, error) { - return rfc3962.EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e Aes128CtsHmacSha96) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - return rfc3962.EncryptMessage(key, message, usage, e) -} - -// DecryptData decrypts the data provided. -func (e Aes128CtsHmacSha96) DecryptData(key, data []byte) ([]byte, error) { - return rfc3962.DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e Aes128CtsHmacSha96) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc3962.DecryptMessage(key, ciphertext, usage, e) -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e Aes128CtsHmacSha96) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - return rfc3961.DeriveKey(protocolKey, usage, e) -} - -// DeriveRandom generates data needed for key generation. -func (e Aes128CtsHmacSha96) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - return rfc3961.DeriveRandom(protocolKey, usage, e) -} - -// VerifyIntegrity checks the integrity of the plaintext message. -func (e Aes128CtsHmacSha96) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - return rfc3961.VerifyIntegrity(protocolKey, ct, pt, usage, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e Aes128CtsHmacSha96) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return common.GetHash(data, protocolKey, common.GetUsageKc(usage), e) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e Aes128CtsHmacSha96) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - c, err := e.GetChecksumHash(protocolKey, data, usage) - if err != nil { - return false - } - return hmac.Equal(chksum, c) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha256-128.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha256-128.go deleted file mode 100644 index b05af7d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes128-cts-hmac-sha256-128.go +++ /dev/null @@ -1,132 +0,0 @@ -package crypto - -import ( - "crypto/aes" - "crypto/hmac" - "crypto/sha256" - "hash" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/rfc8009" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// RFC https://tools.ietf.org/html/rfc8009 - -// Aes128CtsHmacSha256128 implements Kerberos encryption type aes128-cts-hmac-sha256-128 -type Aes128CtsHmacSha256128 struct { -} - -// GetETypeID returns the EType ID number. -func (e Aes128CtsHmacSha256128) GetETypeID() int32 { - return etypeID.AES128_CTS_HMAC_SHA256_128 -} - -// GetHashID returns the checksum type ID number. -func (e Aes128CtsHmacSha256128) GetHashID() int32 { - return chksumtype.HMAC_SHA256_128_AES128 -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e Aes128CtsHmacSha256128) GetKeyByteSize() int { - return 128 / 8 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e Aes128CtsHmacSha256128) GetKeySeedBitLength() int { - return e.GetKeyByteSize() * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e Aes128CtsHmacSha256128) GetHashFunc() func() hash.Hash { - return sha256.New -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e Aes128CtsHmacSha256128) GetMessageBlockByteSize() int { - return 1 -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e Aes128CtsHmacSha256128) GetDefaultStringToKeyParams() string { - return "00008000" -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e Aes128CtsHmacSha256128) GetConfounderByteSize() int { - return aes.BlockSize -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e Aes128CtsHmacSha256128) GetHMACBitLength() int { - return 128 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e Aes128CtsHmacSha256128) GetCypherBlockBitLength() int { - return aes.BlockSize * 8 -} - -// StringToKey returns a key derived from the string provided. -func (e Aes128CtsHmacSha256128) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - saltp := rfc8009.GetSaltP(salt, "aes128-cts-hmac-sha256-128") - return rfc8009.StringToKey(secret, saltp, s2kparams, e) -} - -// RandomToKey returns a key from the bytes provided. -func (e Aes128CtsHmacSha256128) RandomToKey(b []byte) []byte { - return rfc8009.RandomToKey(b) -} - -// EncryptData encrypts the data provided. -func (e Aes128CtsHmacSha256128) EncryptData(key, data []byte) ([]byte, []byte, error) { - return rfc8009.EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e Aes128CtsHmacSha256128) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - return rfc8009.EncryptMessage(key, message, usage, e) -} - -// DecryptData decrypts the data provided. -func (e Aes128CtsHmacSha256128) DecryptData(key, data []byte) ([]byte, error) { - return rfc8009.DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e Aes128CtsHmacSha256128) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc8009.DecryptMessage(key, ciphertext, usage, e) -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e Aes128CtsHmacSha256128) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - return rfc8009.DeriveKey(protocolKey, usage, e), nil -} - -// DeriveRandom generates data needed for key generation. -func (e Aes128CtsHmacSha256128) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - return rfc8009.DeriveRandom(protocolKey, usage, e) -} - -// VerifyIntegrity checks the integrity of the ciphertext message. -// As the hash is calculated over the iv concatenated with the AES cipher output not the plaintext the pt value to this -// interface method is not use. Pass any []byte. -func (e Aes128CtsHmacSha256128) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - // We don't need ib just there for the interface - return rfc8009.VerifyIntegrity(protocolKey, ct, usage, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e Aes128CtsHmacSha256128) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return common.GetHash(data, protocolKey, common.GetUsageKc(usage), e) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e Aes128CtsHmacSha256128) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - c, err := e.GetChecksumHash(protocolKey, data, usage) - if err != nil { - return false - } - return hmac.Equal(chksum, c) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha1-96.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha1-96.go deleted file mode 100644 index 45e439a..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha1-96.go +++ /dev/null @@ -1,129 +0,0 @@ -package crypto - -import ( - "crypto/aes" - "crypto/hmac" - "crypto/sha1" - "hash" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/rfc3961" - "github.com/jcmturner/gokrb5/v8/crypto/rfc3962" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// RFC 3962 - -// Aes256CtsHmacSha96 implements Kerberos encryption type aes256-cts-hmac-sha1-96 -type Aes256CtsHmacSha96 struct { -} - -// GetETypeID returns the EType ID number. -func (e Aes256CtsHmacSha96) GetETypeID() int32 { - return etypeID.AES256_CTS_HMAC_SHA1_96 -} - -// GetHashID returns the checksum type ID number. -func (e Aes256CtsHmacSha96) GetHashID() int32 { - return chksumtype.HMAC_SHA1_96_AES256 -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e Aes256CtsHmacSha96) GetKeyByteSize() int { - return 256 / 8 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e Aes256CtsHmacSha96) GetKeySeedBitLength() int { - return e.GetKeyByteSize() * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e Aes256CtsHmacSha96) GetHashFunc() func() hash.Hash { - return sha1.New -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e Aes256CtsHmacSha96) GetMessageBlockByteSize() int { - return 1 -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e Aes256CtsHmacSha96) GetDefaultStringToKeyParams() string { - return "00001000" -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e Aes256CtsHmacSha96) GetConfounderByteSize() int { - return aes.BlockSize -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e Aes256CtsHmacSha96) GetHMACBitLength() int { - return 96 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e Aes256CtsHmacSha96) GetCypherBlockBitLength() int { - return aes.BlockSize * 8 -} - -// StringToKey returns a key derived from the string provided. -func (e Aes256CtsHmacSha96) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - return rfc3962.StringToKey(secret, salt, s2kparams, e) -} - -// RandomToKey returns a key from the bytes provided. -func (e Aes256CtsHmacSha96) RandomToKey(b []byte) []byte { - return rfc3961.RandomToKey(b) -} - -// EncryptData encrypts the data provided. -func (e Aes256CtsHmacSha96) EncryptData(key, data []byte) ([]byte, []byte, error) { - return rfc3962.EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e Aes256CtsHmacSha96) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - return rfc3962.EncryptMessage(key, message, usage, e) -} - -// DecryptData decrypts the data provided. -func (e Aes256CtsHmacSha96) DecryptData(key, data []byte) ([]byte, error) { - return rfc3962.DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e Aes256CtsHmacSha96) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc3962.DecryptMessage(key, ciphertext, usage, e) -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e Aes256CtsHmacSha96) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - return rfc3961.DeriveKey(protocolKey, usage, e) -} - -// DeriveRandom generates data needed for key generation. -func (e Aes256CtsHmacSha96) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - return rfc3961.DeriveRandom(protocolKey, usage, e) -} - -// VerifyIntegrity checks the integrity of the plaintext message. -func (e Aes256CtsHmacSha96) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - return rfc3961.VerifyIntegrity(protocolKey, ct, pt, usage, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e Aes256CtsHmacSha96) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return common.GetHash(data, protocolKey, common.GetUsageKc(usage), e) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e Aes256CtsHmacSha96) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - c, err := e.GetChecksumHash(protocolKey, data, usage) - if err != nil { - return false - } - return hmac.Equal(chksum, c) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha384-192.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha384-192.go deleted file mode 100644 index 6a54475..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/aes256-cts-hmac-sha384-192.go +++ /dev/null @@ -1,132 +0,0 @@ -package crypto - -import ( - "crypto/aes" - "crypto/hmac" - "crypto/sha512" - "hash" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/rfc8009" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// RFC https://tools.ietf.org/html/rfc8009 - -// Aes256CtsHmacSha384192 implements Kerberos encryption type aes256-cts-hmac-sha384-192 -type Aes256CtsHmacSha384192 struct { -} - -// GetETypeID returns the EType ID number. -func (e Aes256CtsHmacSha384192) GetETypeID() int32 { - return etypeID.AES256_CTS_HMAC_SHA384_192 -} - -// GetHashID returns the checksum type ID number. -func (e Aes256CtsHmacSha384192) GetHashID() int32 { - return chksumtype.HMAC_SHA384_192_AES256 -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e Aes256CtsHmacSha384192) GetKeyByteSize() int { - return 192 / 8 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e Aes256CtsHmacSha384192) GetKeySeedBitLength() int { - return e.GetKeyByteSize() * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e Aes256CtsHmacSha384192) GetHashFunc() func() hash.Hash { - return sha512.New384 -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e Aes256CtsHmacSha384192) GetMessageBlockByteSize() int { - return 1 -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e Aes256CtsHmacSha384192) GetDefaultStringToKeyParams() string { - return "00008000" -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e Aes256CtsHmacSha384192) GetConfounderByteSize() int { - return aes.BlockSize -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e Aes256CtsHmacSha384192) GetHMACBitLength() int { - return 192 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e Aes256CtsHmacSha384192) GetCypherBlockBitLength() int { - return aes.BlockSize * 8 -} - -// StringToKey returns a key derived from the string provided. -func (e Aes256CtsHmacSha384192) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - saltp := rfc8009.GetSaltP(salt, "aes256-cts-hmac-sha384-192") - return rfc8009.StringToKey(secret, saltp, s2kparams, e) -} - -// RandomToKey returns a key from the bytes provided. -func (e Aes256CtsHmacSha384192) RandomToKey(b []byte) []byte { - return rfc8009.RandomToKey(b) -} - -// EncryptData encrypts the data provided. -func (e Aes256CtsHmacSha384192) EncryptData(key, data []byte) ([]byte, []byte, error) { - return rfc8009.EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e Aes256CtsHmacSha384192) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - return rfc8009.EncryptMessage(key, message, usage, e) -} - -// DecryptData decrypts the data provided. -func (e Aes256CtsHmacSha384192) DecryptData(key, data []byte) ([]byte, error) { - return rfc8009.DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e Aes256CtsHmacSha384192) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc8009.DecryptMessage(key, ciphertext, usage, e) -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e Aes256CtsHmacSha384192) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - return rfc8009.DeriveKey(protocolKey, usage, e), nil -} - -// DeriveRandom generates data needed for key generation. -func (e Aes256CtsHmacSha384192) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - return rfc8009.DeriveRandom(protocolKey, usage, e) -} - -// VerifyIntegrity checks the integrity of the ciphertext message. -// As the hash is calculated over the iv concatenated with the AES cipher output not the plaintext the pt value to this -// interface method is not use. Pass any []byte. -func (e Aes256CtsHmacSha384192) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - // We don't need ib just there for the interface - return rfc8009.VerifyIntegrity(protocolKey, ct, usage, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e Aes256CtsHmacSha384192) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return common.GetHash(data, protocolKey, common.GetUsageKc(usage), e) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e Aes256CtsHmacSha384192) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - c, err := e.GetChecksumHash(protocolKey, data, usage) - if err != nil { - return false - } - return hmac.Equal(chksum, c) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/common/common.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/common/common.go deleted file mode 100644 index dab55be..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/common/common.go +++ /dev/null @@ -1,132 +0,0 @@ -// Package common provides encryption methods common across encryption types -package common - -import ( - "bytes" - "crypto/hmac" - "encoding/binary" - "encoding/hex" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -// ZeroPad pads bytes with zeros to nearest multiple of message size m. -func ZeroPad(b []byte, m int) ([]byte, error) { - if m <= 0 { - return nil, errors.New("Invalid message block size when padding") - } - if b == nil || len(b) == 0 { - return nil, errors.New("Data not valid to pad: Zero size") - } - if l := len(b) % m; l != 0 { - n := m - l - z := make([]byte, n) - b = append(b, z...) - } - return b, nil -} - -// PKCS7Pad pads bytes according to RFC 2315 to nearest multiple of message size m. -func PKCS7Pad(b []byte, m int) ([]byte, error) { - if m <= 0 { - return nil, errors.New("Invalid message block size when padding") - } - if b == nil || len(b) == 0 { - return nil, errors.New("Data not valid to pad: Zero size") - } - n := m - (len(b) % m) - pb := make([]byte, len(b)+n) - copy(pb, b) - copy(pb[len(b):], bytes.Repeat([]byte{byte(n)}, n)) - return pb, nil -} - -// PKCS7Unpad removes RFC 2315 padding from byes where message size is m. -func PKCS7Unpad(b []byte, m int) ([]byte, error) { - if m <= 0 { - return nil, errors.New("invalid message block size when unpadding") - } - if b == nil || len(b) == 0 { - return nil, errors.New("padded data not valid: Zero size") - } - if len(b)%m != 0 { - return nil, errors.New("padded data not valid: Not multiple of message block size") - } - c := b[len(b)-1] - n := int(c) - if n == 0 || n > len(b) { - return nil, errors.New("padded data not valid: Data may not have been padded") - } - for i := 0; i < n; i++ { - if b[len(b)-n+i] != c { - return nil, errors.New("padded data not valid") - } - } - return b[:len(b)-n], nil -} - -// GetHash generates the keyed hash value according to the etype's hash function. -func GetHash(pt, key []byte, usage []byte, etype etype.EType) ([]byte, error) { - k, err := etype.DeriveKey(key, usage) - if err != nil { - return nil, fmt.Errorf("unable to derive key for checksum: %v", err) - } - mac := hmac.New(etype.GetHashFunc(), k) - p := make([]byte, len(pt)) - copy(p, pt) - mac.Write(p) - return mac.Sum(nil)[:etype.GetHMACBitLength()/8], nil -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func GetChecksumHash(b, key []byte, usage uint32, etype etype.EType) ([]byte, error) { - return GetHash(b, key, GetUsageKc(usage), etype) -} - -// GetIntegrityHash returns a keyed integrity hash of the bytes provided. -func GetIntegrityHash(b, key []byte, usage uint32, etype etype.EType) ([]byte, error) { - return GetHash(b, key, GetUsageKi(usage), etype) -} - -// VerifyChecksum compares the checksum of the msg bytes is the same as the checksum provided. -func VerifyChecksum(key, chksum, msg []byte, usage uint32, etype etype.EType) bool { - //The encrypted message is a concatenation of the encrypted output and the hash HMAC. - expectedMAC, _ := GetChecksumHash(msg, key, usage, etype) - return hmac.Equal(chksum, expectedMAC) -} - -// GetUsageKc returns the checksum key usage value for the usage number un. -// -// See RFC 3961 5.3 key-derivation function definition. -func GetUsageKc(un uint32) []byte { - return getUsage(un, 0x99) -} - -// GetUsageKe returns the encryption key usage value for the usage number un -// -// See RFC 3961 5.3 key-derivation function definition. -func GetUsageKe(un uint32) []byte { - return getUsage(un, 0xAA) -} - -// GetUsageKi returns the integrity key usage value for the usage number un -// -// See RFC 3961 5.3 key-derivation function definition. -func GetUsageKi(un uint32) []byte { - return getUsage(un, 0x55) -} - -func getUsage(un uint32, o byte) []byte { - var buf bytes.Buffer - binary.Write(&buf, binary.BigEndian, un) - return append(buf.Bytes(), o) -} - -// IterationsToS2Kparams converts the number of iterations as an integer to a string representation. -func IterationsToS2Kparams(i uint32) string { - b := make([]byte, 4, 4) - binary.BigEndian.PutUint32(b, i) - return hex.EncodeToString(b) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/crypto.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/crypto.go deleted file mode 100644 index 5c96ddf..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/crypto.go +++ /dev/null @@ -1,175 +0,0 @@ -// Package crypto implements cryptographic functions for Kerberos 5 implementation. -package crypto - -import ( - "encoding/hex" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto/etype" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" - "github.com/jcmturner/gokrb5/v8/iana/patype" - "github.com/jcmturner/gokrb5/v8/types" -) - -// GetEtype returns an instances of the required etype struct for the etype ID. -func GetEtype(id int32) (etype.EType, error) { - switch id { - case etypeID.AES128_CTS_HMAC_SHA1_96: - var et Aes128CtsHmacSha96 - return et, nil - case etypeID.AES256_CTS_HMAC_SHA1_96: - var et Aes256CtsHmacSha96 - return et, nil - case etypeID.AES128_CTS_HMAC_SHA256_128: - var et Aes128CtsHmacSha256128 - return et, nil - case etypeID.AES256_CTS_HMAC_SHA384_192: - var et Aes256CtsHmacSha384192 - return et, nil - case etypeID.DES3_CBC_SHA1_KD: - var et Des3CbcSha1Kd - return et, nil - case etypeID.RC4_HMAC: - var et RC4HMAC - return et, nil - default: - return nil, fmt.Errorf("unknown or unsupported EType: %d", id) - } -} - -// GetChksumEtype returns an instances of the required etype struct for the checksum ID. -func GetChksumEtype(id int32) (etype.EType, error) { - switch id { - case chksumtype.HMAC_SHA1_96_AES128: - var et Aes128CtsHmacSha96 - return et, nil - case chksumtype.HMAC_SHA1_96_AES256: - var et Aes256CtsHmacSha96 - return et, nil - case chksumtype.HMAC_SHA256_128_AES128: - var et Aes128CtsHmacSha256128 - return et, nil - case chksumtype.HMAC_SHA384_192_AES256: - var et Aes256CtsHmacSha384192 - return et, nil - case chksumtype.HMAC_SHA1_DES3_KD: - var et Des3CbcSha1Kd - return et, nil - case chksumtype.KERB_CHECKSUM_HMAC_MD5: - var et RC4HMAC - return et, nil - //case chksumtype.KERB_CHECKSUM_HMAC_MD5_UNSIGNED: - // var et RC4HMAC - // return et, nil - default: - return nil, fmt.Errorf("unknown or unsupported checksum type: %d", id) - } -} - -// GetKeyFromPassword generates an encryption key from the principal's password. -func GetKeyFromPassword(passwd string, cname types.PrincipalName, realm string, etypeID int32, pas types.PADataSequence) (types.EncryptionKey, etype.EType, error) { - var key types.EncryptionKey - et, err := GetEtype(etypeID) - if err != nil { - return key, et, fmt.Errorf("error getting encryption type: %v", err) - } - sk2p := et.GetDefaultStringToKeyParams() - var salt string - var paID int32 - for _, pa := range pas { - switch pa.PADataType { - case patype.PA_PW_SALT: - if paID > pa.PADataType { - continue - } - salt = string(pa.PADataValue) - case patype.PA_ETYPE_INFO: - if paID > pa.PADataType { - continue - } - var eti types.ETypeInfo - err := eti.Unmarshal(pa.PADataValue) - if err != nil { - return key, et, fmt.Errorf("error unmashaling PA Data to PA-ETYPE-INFO2: %v", err) - } - if etypeID != eti[0].EType { - et, err = GetEtype(eti[0].EType) - if err != nil { - return key, et, fmt.Errorf("error getting encryption type: %v", err) - } - } - salt = string(eti[0].Salt) - case patype.PA_ETYPE_INFO2: - if paID > pa.PADataType { - continue - } - var et2 types.ETypeInfo2 - err := et2.Unmarshal(pa.PADataValue) - if err != nil { - return key, et, fmt.Errorf("error unmashalling PA Data to PA-ETYPE-INFO2: %v", err) - } - if etypeID != et2[0].EType { - et, err = GetEtype(et2[0].EType) - if err != nil { - return key, et, fmt.Errorf("error getting encryption type: %v", err) - } - } - if len(et2[0].S2KParams) == 4 { - sk2p = hex.EncodeToString(et2[0].S2KParams) - } - salt = et2[0].Salt - } - } - if salt == "" { - salt = cname.GetSalt(realm) - } - k, err := et.StringToKey(passwd, salt, sk2p) - if err != nil { - return key, et, fmt.Errorf("error deriving key from string: %+v", err) - } - key = types.EncryptionKey{ - KeyType: etypeID, - KeyValue: k, - } - return key, et, nil -} - -// GetEncryptedData encrypts the data provided and returns and EncryptedData type. -// Pass a usage value of zero to use the key provided directly rather than deriving one. -func GetEncryptedData(plainBytes []byte, key types.EncryptionKey, usage uint32, kvno int) (types.EncryptedData, error) { - var ed types.EncryptedData - et, err := GetEtype(key.KeyType) - if err != nil { - return ed, fmt.Errorf("error getting etype: %v", err) - } - _, b, err := et.EncryptMessage(key.KeyValue, plainBytes, usage) - if err != nil { - return ed, err - } - - ed = types.EncryptedData{ - EType: key.KeyType, - Cipher: b, - KVNO: kvno, - } - return ed, nil -} - -// DecryptEncPart decrypts the EncryptedData. -func DecryptEncPart(ed types.EncryptedData, key types.EncryptionKey, usage uint32) ([]byte, error) { - return DecryptMessage(ed.Cipher, key, usage) -} - -// DecryptMessage decrypts the ciphertext and verifies the integrity. -func DecryptMessage(ciphertext []byte, key types.EncryptionKey, usage uint32) ([]byte, error) { - et, err := GetEtype(key.KeyType) - if err != nil { - return []byte{}, fmt.Errorf("error decrypting: %v", err) - } - b, err := et.DecryptMessage(key.KeyValue, ciphertext, usage) - if err != nil { - return nil, fmt.Errorf("error decrypting: %v", err) - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/des3-cbc-sha1-kd.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/des3-cbc-sha1-kd.go deleted file mode 100644 index 6e650eb..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/des3-cbc-sha1-kd.go +++ /dev/null @@ -1,139 +0,0 @@ -package crypto - -import ( - "crypto/des" - "crypto/hmac" - "crypto/sha1" - "errors" - "hash" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/rfc3961" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -//RFC: 3961 Section 6.3 - -// Des3CbcSha1Kd implements Kerberos encryption type des3-cbc-hmac-sha1-kd -type Des3CbcSha1Kd struct { -} - -// GetETypeID returns the EType ID number. -func (e Des3CbcSha1Kd) GetETypeID() int32 { - return etypeID.DES3_CBC_SHA1_KD -} - -// GetHashID returns the checksum type ID number. -func (e Des3CbcSha1Kd) GetHashID() int32 { - return chksumtype.HMAC_SHA1_DES3_KD -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e Des3CbcSha1Kd) GetKeyByteSize() int { - return 24 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e Des3CbcSha1Kd) GetKeySeedBitLength() int { - return 21 * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e Des3CbcSha1Kd) GetHashFunc() func() hash.Hash { - return sha1.New -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e Des3CbcSha1Kd) GetMessageBlockByteSize() int { - //For traditional CBC mode with padding, it would be the underlying cipher's block size - return des.BlockSize -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e Des3CbcSha1Kd) GetDefaultStringToKeyParams() string { - var s string - return s -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e Des3CbcSha1Kd) GetConfounderByteSize() int { - return des.BlockSize -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e Des3CbcSha1Kd) GetHMACBitLength() int { - return e.GetHashFunc()().Size() * 8 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e Des3CbcSha1Kd) GetCypherBlockBitLength() int { - return des.BlockSize * 8 -} - -// StringToKey returns a key derived from the string provided. -func (e Des3CbcSha1Kd) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - if s2kparams != "" { - return []byte{}, errors.New("s2kparams must be an empty string") - } - return rfc3961.DES3StringToKey(secret, salt, e) -} - -// RandomToKey returns a key from the bytes provided. -func (e Des3CbcSha1Kd) RandomToKey(b []byte) []byte { - return rfc3961.DES3RandomToKey(b) -} - -// DeriveRandom generates data needed for key generation. -func (e Des3CbcSha1Kd) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - r, err := rfc3961.DeriveRandom(protocolKey, usage, e) - return r, err -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e Des3CbcSha1Kd) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - r, err := e.DeriveRandom(protocolKey, usage) - if err != nil { - return nil, err - } - return e.RandomToKey(r), nil -} - -// EncryptData encrypts the data provided. -func (e Des3CbcSha1Kd) EncryptData(key, data []byte) ([]byte, []byte, error) { - return rfc3961.DES3EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e Des3CbcSha1Kd) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - return rfc3961.DES3EncryptMessage(key, message, usage, e) -} - -// DecryptData decrypts the data provided. -func (e Des3CbcSha1Kd) DecryptData(key, data []byte) ([]byte, error) { - return rfc3961.DES3DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e Des3CbcSha1Kd) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc3961.DES3DecryptMessage(key, ciphertext, usage, e) -} - -// VerifyIntegrity checks the integrity of the plaintext message. -func (e Des3CbcSha1Kd) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - return rfc3961.VerifyIntegrity(protocolKey, ct, pt, usage, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e Des3CbcSha1Kd) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return common.GetHash(data, protocolKey, common.GetUsageKc(usage), e) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e Des3CbcSha1Kd) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - c, err := e.GetChecksumHash(protocolKey, data, usage) - if err != nil { - return false - } - return hmac.Equal(chksum, c) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/etype/etype.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/etype/etype.go deleted file mode 100644 index ab1496d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/etype/etype.go +++ /dev/null @@ -1,29 +0,0 @@ -// Package etype provides the Kerberos Encryption Type interface -package etype - -import "hash" - -// EType is the interface defining the Encryption Type. -type EType interface { - GetETypeID() int32 - GetHashID() int32 - GetKeyByteSize() int - GetKeySeedBitLength() int - GetDefaultStringToKeyParams() string - StringToKey(string, salt, s2kparams string) ([]byte, error) - RandomToKey(b []byte) []byte - GetHMACBitLength() int - GetMessageBlockByteSize() int - EncryptData(key, data []byte) ([]byte, []byte, error) - EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) - DecryptData(key, data []byte) ([]byte, error) - DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) - GetCypherBlockBitLength() int - GetConfounderByteSize() int - DeriveKey(protocolKey, usage []byte) ([]byte, error) - DeriveRandom(protocolKey, usage []byte) ([]byte, error) - VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool - GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) - VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool - GetHashFunc() func() hash.Hash -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rc4-hmac.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rc4-hmac.go deleted file mode 100644 index 42f84b8..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rc4-hmac.go +++ /dev/null @@ -1,133 +0,0 @@ -package crypto - -import ( - "bytes" - "crypto/hmac" - "crypto/md5" - "hash" - "io" - - "github.com/jcmturner/gokrb5/v8/crypto/rfc3961" - "github.com/jcmturner/gokrb5/v8/crypto/rfc4757" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" - "golang.org/x/crypto/md4" -) - -// RC4HMAC implements Kerberos encryption type rc4-hmac -type RC4HMAC struct { -} - -// GetETypeID returns the EType ID number. -func (e RC4HMAC) GetETypeID() int32 { - return etypeID.RC4_HMAC -} - -// GetHashID returns the checksum type ID number. -func (e RC4HMAC) GetHashID() int32 { - return chksumtype.KERB_CHECKSUM_HMAC_MD5 -} - -// GetKeyByteSize returns the number of bytes for key of this etype. -func (e RC4HMAC) GetKeyByteSize() int { - return 16 -} - -// GetKeySeedBitLength returns the number of bits for the seed for key generation. -func (e RC4HMAC) GetKeySeedBitLength() int { - return e.GetKeyByteSize() * 8 -} - -// GetHashFunc returns the hash function for this etype. -func (e RC4HMAC) GetHashFunc() func() hash.Hash { - return md5.New -} - -// GetMessageBlockByteSize returns the block size for the etype's messages. -func (e RC4HMAC) GetMessageBlockByteSize() int { - return 1 -} - -// GetDefaultStringToKeyParams returns the default key derivation parameters in string form. -func (e RC4HMAC) GetDefaultStringToKeyParams() string { - return "" -} - -// GetConfounderByteSize returns the byte count for confounder to be used during cryptographic operations. -func (e RC4HMAC) GetConfounderByteSize() int { - return 8 -} - -// GetHMACBitLength returns the bit count size of the integrity hash. -func (e RC4HMAC) GetHMACBitLength() int { - return md5.Size * 8 -} - -// GetCypherBlockBitLength returns the bit count size of the cypher block. -func (e RC4HMAC) GetCypherBlockBitLength() int { - return 8 // doesn't really apply -} - -// StringToKey returns a key derived from the string provided. -func (e RC4HMAC) StringToKey(secret string, salt string, s2kparams string) ([]byte, error) { - return rfc4757.StringToKey(secret) -} - -// RandomToKey returns a key from the bytes provided. -func (e RC4HMAC) RandomToKey(b []byte) []byte { - r := bytes.NewReader(b) - h := md4.New() - io.Copy(h, r) - return h.Sum(nil) -} - -// EncryptData encrypts the data provided. -func (e RC4HMAC) EncryptData(key, data []byte) ([]byte, []byte, error) { - b, err := rfc4757.EncryptData(key, data, e) - return []byte{}, b, err -} - -// EncryptMessage encrypts the message provided and concatenates it with the integrity hash to create an encrypted message. -func (e RC4HMAC) EncryptMessage(key, message []byte, usage uint32) ([]byte, []byte, error) { - b, err := rfc4757.EncryptMessage(key, message, usage, false, e) - return []byte{}, b, err -} - -// DecryptData decrypts the data provided. -func (e RC4HMAC) DecryptData(key, data []byte) ([]byte, error) { - return rfc4757.DecryptData(key, data, e) -} - -// DecryptMessage decrypts the message provided and verifies the integrity of the message. -func (e RC4HMAC) DecryptMessage(key, ciphertext []byte, usage uint32) ([]byte, error) { - return rfc4757.DecryptMessage(key, ciphertext, usage, false, e) -} - -// DeriveKey derives a key from the protocol key based on the usage value. -func (e RC4HMAC) DeriveKey(protocolKey, usage []byte) ([]byte, error) { - return rfc4757.HMAC(protocolKey, usage), nil -} - -// DeriveRandom generates data needed for key generation. -func (e RC4HMAC) DeriveRandom(protocolKey, usage []byte) ([]byte, error) { - return rfc3961.DeriveRandom(protocolKey, usage, e) -} - -// VerifyIntegrity checks the integrity of the plaintext message. -func (e RC4HMAC) VerifyIntegrity(protocolKey, ct, pt []byte, usage uint32) bool { - return rfc4757.VerifyIntegrity(protocolKey, pt, ct, e) -} - -// GetChecksumHash returns a keyed checksum hash of the bytes provided. -func (e RC4HMAC) GetChecksumHash(protocolKey, data []byte, usage uint32) ([]byte, error) { - return rfc4757.Checksum(protocolKey, usage, data) -} - -// VerifyChecksum compares the checksum of the message bytes is the same as the checksum provided. -func (e RC4HMAC) VerifyChecksum(protocolKey, data, chksum []byte, usage uint32) bool { - checksum, err := rfc4757.Checksum(protocolKey, usage, data) - if err != nil { - return false - } - return hmac.Equal(checksum, chksum) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/encryption.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/encryption.go deleted file mode 100644 index 1383258..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/encryption.go +++ /dev/null @@ -1,119 +0,0 @@ -// Package rfc3961 provides encryption and checksum methods as specified in RFC 3961 -package rfc3961 - -import ( - "crypto/cipher" - "crypto/des" - "crypto/hmac" - "crypto/rand" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -// DES3EncryptData encrypts the data provided using DES3 and methods specific to the etype provided. -func DES3EncryptData(key, data []byte, e etype.EType) ([]byte, []byte, error) { - if len(key) != e.GetKeyByteSize() { - return nil, nil, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - data, _ = common.ZeroPad(data, e.GetMessageBlockByteSize()) - - block, err := des.NewTripleDESCipher(key) - if err != nil { - return nil, nil, fmt.Errorf("error creating cipher: %v", err) - } - - //RFC 3961: initial cipher state All bits zero - ivz := make([]byte, des.BlockSize) - - ct := make([]byte, len(data)) - mode := cipher.NewCBCEncrypter(block, ivz) - mode.CryptBlocks(ct, data) - return ct[len(ct)-e.GetMessageBlockByteSize():], ct, nil -} - -// DES3EncryptMessage encrypts the message provided using DES3 and methods specific to the etype provided. -// The encrypted data is concatenated with its integrity hash to create an encrypted message. -func DES3EncryptMessage(key, message []byte, usage uint32, e etype.EType) ([]byte, []byte, error) { - //confounder - c := make([]byte, e.GetConfounderByteSize()) - _, err := rand.Read(c) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("could not generate random confounder: %v", err) - } - plainBytes := append(c, message...) - plainBytes, _ = common.ZeroPad(plainBytes, e.GetMessageBlockByteSize()) - - // Derive key for encryption from usage - var k []byte - if usage != 0 { - k, err = e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("error deriving key for encryption: %v", err) - } - } - - iv, b, err := e.EncryptData(k, plainBytes) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - - // Generate and append integrity hash - ih, err := common.GetIntegrityHash(plainBytes, key, usage, e) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - b = append(b, ih...) - return iv, b, nil -} - -// DES3DecryptData decrypts the data provided using DES3 and methods specific to the etype provided. -func DES3DecryptData(key, data []byte, e etype.EType) ([]byte, error) { - if len(key) != e.GetKeyByteSize() { - return []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - - if len(data) < des.BlockSize || len(data)%des.BlockSize != 0 { - return []byte{}, errors.New("ciphertext is not a multiple of the block size") - } - block, err := des.NewTripleDESCipher(key) - if err != nil { - return []byte{}, fmt.Errorf("error creating cipher: %v", err) - } - pt := make([]byte, len(data)) - ivz := make([]byte, des.BlockSize) - mode := cipher.NewCBCDecrypter(block, ivz) - mode.CryptBlocks(pt, data) - return pt, nil -} - -// DES3DecryptMessage decrypts the message provided using DES3 and methods specific to the etype provided. -// The integrity of the message is also verified. -func DES3DecryptMessage(key, ciphertext []byte, usage uint32, e etype.EType) ([]byte, error) { - //Derive the key - k, err := e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return nil, fmt.Errorf("error deriving key: %v", err) - } - // Strip off the checksum from the end - b, err := e.DecryptData(k, ciphertext[:len(ciphertext)-e.GetHMACBitLength()/8]) - if err != nil { - return nil, fmt.Errorf("error decrypting: %v", err) - } - //Verify checksum - if !e.VerifyIntegrity(key, ciphertext, b, usage) { - return nil, errors.New("error decrypting: integrity verification failed") - } - //Remove the confounder bytes - return b[e.GetConfounderByteSize():], nil -} - -// VerifyIntegrity verifies the integrity of cipertext bytes ct. -func VerifyIntegrity(key, ct, pt []byte, usage uint32, etype etype.EType) bool { - h := make([]byte, etype.GetHMACBitLength()/8) - copy(h, ct[len(ct)-etype.GetHMACBitLength()/8:]) - expectedMAC, _ := common.GetIntegrityHash(pt, key, usage, etype) - return hmac.Equal(h, expectedMAC) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/keyDerivation.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/keyDerivation.go deleted file mode 100644 index ed9b169..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/keyDerivation.go +++ /dev/null @@ -1,169 +0,0 @@ -package rfc3961 - -import ( - "bytes" - - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -const ( - prfconstant = "prf" -) - -// DeriveRandom implements the RFC 3961 defined function: DR(Key, Constant) = k-truncate(E(Key, Constant, initial-cipher-state)). -// -// key: base key or protocol key. Likely to be a key from a keytab file. -// -// usage: a constant. -// -// n: block size in bits (not bytes) - note if you use something like aes.BlockSize this is in bytes. -// -// k: key length / key seed length in bits. Eg. for AES256 this value is 256. -// -// e: the encryption etype function to use. -func DeriveRandom(key, usage []byte, e etype.EType) ([]byte, error) { - n := e.GetCypherBlockBitLength() - k := e.GetKeySeedBitLength() - //Ensure the usage constant is at least the size of the cypher block size. Pass it through the nfold algorithm that will "stretch" it if needs be. - nFoldUsage := Nfold(usage, n) - //k-truncate implemented by creating a byte array the size of k (k is in bits hence /8) - out := make([]byte, k/8) - // Keep feeding the output back into the encryption function until it is no longer short than k. - _, K, err := e.EncryptData(key, nFoldUsage) - if err != nil { - return out, err - } - for i := copy(out, K); i < len(out); { - _, K, _ = e.EncryptData(key, K) - i = i + copy(out[i:], K) - } - return out, nil -} - -// DeriveKey derives a key from the protocol key based on the usage and the etype's specific methods. -func DeriveKey(protocolKey, usage []byte, e etype.EType) ([]byte, error) { - r, err := e.DeriveRandom(protocolKey, usage) - if err != nil { - return nil, err - } - return e.RandomToKey(r), nil -} - -// RandomToKey returns a key from the bytes provided according to the definition in RFC 3961. -func RandomToKey(b []byte) []byte { - return b -} - -// DES3RandomToKey returns a key from the bytes provided according to the definition in RFC 3961 for DES3 etypes. -func DES3RandomToKey(b []byte) []byte { - r := fixWeakKey(stretch56Bits(b[:7])) - r2 := fixWeakKey(stretch56Bits(b[7:14])) - r = append(r, r2...) - r3 := fixWeakKey(stretch56Bits(b[14:21])) - r = append(r, r3...) - return r -} - -// DES3StringToKey returns a key derived from the string provided according to the definition in RFC 3961 for DES3 etypes. -func DES3StringToKey(secret, salt string, e etype.EType) ([]byte, error) { - s := secret + salt - tkey := e.RandomToKey(Nfold([]byte(s), e.GetKeySeedBitLength())) - return e.DeriveKey(tkey, []byte("kerberos")) -} - -// PseudoRandom function as defined in RFC 3961 -func PseudoRandom(key, b []byte, e etype.EType) ([]byte, error) { - h := e.GetHashFunc()() - h.Write(b) - tmp := h.Sum(nil)[:e.GetMessageBlockByteSize()] - k, err := e.DeriveKey(key, []byte(prfconstant)) - if err != nil { - return []byte{}, err - } - _, prf, err := e.EncryptData(k, tmp) - if err != nil { - return []byte{}, err - } - return prf, nil -} - -func stretch56Bits(b []byte) []byte { - d := make([]byte, len(b), len(b)) - copy(d, b) - var lb byte - for i, v := range d { - bv, nb := calcEvenParity(v) - d[i] = nb - if bv != 0 { - lb = lb | (1 << uint(i+1)) - } else { - lb = lb &^ (1 << uint(i+1)) - } - } - _, lb = calcEvenParity(lb) - d = append(d, lb) - return d -} - -func calcEvenParity(b byte) (uint8, uint8) { - lowestbit := b & 0x01 - // c counter of 1s in the first 7 bits of the byte - var c int - // Iterate over the highest 7 bits (hence p starts at 1 not zero) and count the 1s. - for p := 1; p < 8; p++ { - v := b & (1 << uint(p)) - if v != 0 { - c++ - } - } - if c%2 == 0 { - //Even number of 1s so set parity to 1 - b = b | 1 - } else { - //Odd number of 1s so set parity to 0 - b = b &^ 1 - } - return lowestbit, b -} - -func fixWeakKey(b []byte) []byte { - if weak(b) { - b[7] ^= 0xF0 - } - return b -} - -func weak(b []byte) bool { - // weak keys from https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-67r1.pdf - weakKeys := [4][]byte{ - {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, - {0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE}, - {0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1}, - {0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E}, - } - semiWeakKeys := [12][]byte{ - {0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E}, - {0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01}, - {0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1}, - {0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01}, - {0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE}, - {0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01}, - {0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1}, - {0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E}, - {0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE}, - {0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E}, - {0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE}, - {0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1}, - } - for _, k := range weakKeys { - if bytes.Equal(b, k) { - return true - } - } - for _, k := range semiWeakKeys { - if bytes.Equal(b, k) { - return true - } - } - return false -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/nfold.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/nfold.go deleted file mode 100644 index 9536b1e..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3961/nfold.go +++ /dev/null @@ -1,107 +0,0 @@ -package rfc3961 - -// Implementation of the n-fold algorithm as defined in RFC 3961. - -/* Credits -This golang implementation of nfold used the following project for help with implementation detail. -Although their source is in java it was helpful as a reference implementation of the RFC. -You can find the source code of their open source project along with license information below. -We acknowledge and are grateful to these developers for their contributions to open source - -Project: Apache Directory (http://http://directory.apache.org/) -https://svn.apache.org/repos/asf/directory/apacheds/tags/1.5.1/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFold.java -License: http://www.apache.org/licenses/LICENSE-2.0 -*/ - -// Nfold expands the key to ensure it is not smaller than one cipher block. -// Defined in RFC 3961. -// -// m input bytes that will be "stretched" to the least common multiple of n bits and the bit length of m. -func Nfold(m []byte, n int) []byte { - k := len(m) * 8 - - //Get the lowest common multiple of the two bit sizes - lcm := lcm(n, k) - relicate := lcm / k - var sumBytes []byte - - for i := 0; i < relicate; i++ { - rotation := 13 * i - sumBytes = append(sumBytes, rotateRight(m, rotation)...) - } - - nfold := make([]byte, n/8) - sum := make([]byte, n/8) - for i := 0; i < lcm/n; i++ { - for j := 0; j < n/8; j++ { - sum[j] = sumBytes[j+(i*len(sum))] - } - nfold = onesComplementAddition(nfold, sum) - } - return nfold -} - -func onesComplementAddition(n1, n2 []byte) []byte { - numBits := len(n1) * 8 - out := make([]byte, numBits/8) - carry := 0 - for i := numBits - 1; i > -1; i-- { - n1b := getBit(&n1, i) - n2b := getBit(&n2, i) - s := n1b + n2b + carry - - if s == 0 || s == 1 { - setBit(&out, i, s) - carry = 0 - } else if s == 2 { - carry = 1 - } else if s == 3 { - setBit(&out, i, 1) - carry = 1 - } - } - if carry == 1 { - carryArray := make([]byte, len(n1)) - carryArray[len(carryArray)-1] = 1 - out = onesComplementAddition(out, carryArray) - } - return out -} - -func rotateRight(b []byte, step int) []byte { - out := make([]byte, len(b)) - bitLen := len(b) * 8 - for i := 0; i < bitLen; i++ { - v := getBit(&b, i) - setBit(&out, (i+step)%bitLen, v) - } - return out -} - -func lcm(x, y int) int { - return (x * y) / gcd(x, y) -} - -func gcd(x, y int) int { - for y != 0 { - x, y = y, x%y - } - return x -} - -func getBit(b *[]byte, p int) int { - pByte := p / 8 - pBit := uint(p % 8) - vByte := (*b)[pByte] - vInt := int(vByte >> (8 - (pBit + 1)) & 0x0001) - return vInt -} - -func setBit(b *[]byte, p, v int) { - pByte := p / 8 - pBit := uint(p % 8) - oldByte := (*b)[pByte] - var newByte byte - newByte = byte(v<<(8-(pBit+1))) | oldByte - (*b)[pByte] = newByte -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/encryption.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/encryption.go deleted file mode 100644 index 5ff89e8..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/encryption.go +++ /dev/null @@ -1,89 +0,0 @@ -// Package rfc3962 provides encryption and checksum methods as specified in RFC 3962 -package rfc3962 - -import ( - "crypto/rand" - "errors" - "fmt" - - "github.com/jcmturner/aescts/v2" - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -// EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 3962. -func EncryptData(key, data []byte, e etype.EType) ([]byte, []byte, error) { - if len(key) != e.GetKeyByteSize() { - return []byte{}, []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - ivz := make([]byte, e.GetCypherBlockBitLength()/8) - return aescts.Encrypt(key, ivz, data) -} - -// EncryptMessage encrypts the message provided using the methods specific to the etype provided as defined in RFC 3962. -// The encrypted data is concatenated with its integrity hash to create an encrypted message. -func EncryptMessage(key, message []byte, usage uint32, e etype.EType) ([]byte, []byte, error) { - if len(key) != e.GetKeyByteSize() { - return []byte{}, []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - //confounder - c := make([]byte, e.GetConfounderByteSize()) - _, err := rand.Read(c) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("could not generate random confounder: %v", err) - } - plainBytes := append(c, message...) - - // Derive key for encryption from usage - var k []byte - if usage != 0 { - k, err = e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("error deriving key for encryption: %v", err) - } - } - - // Encrypt the data - iv, b, err := e.EncryptData(k, plainBytes) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - - // Generate and append integrity hash - ih, err := common.GetIntegrityHash(plainBytes, key, usage, e) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - b = append(b, ih...) - return iv, b, nil -} - -// DecryptData decrypts the data provided using the methods specific to the etype provided as defined in RFC 3962. -func DecryptData(key, data []byte, e etype.EType) ([]byte, error) { - if len(key) != e.GetKeyByteSize() { - return []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - ivz := make([]byte, e.GetCypherBlockBitLength()/8) - return aescts.Decrypt(key, ivz, data) -} - -// DecryptMessage decrypts the message provided using the methods specific to the etype provided as defined in RFC 3962. -// The integrity of the message is also verified. -func DecryptMessage(key, ciphertext []byte, usage uint32, e etype.EType) ([]byte, error) { - //Derive the key - k, err := e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return nil, fmt.Errorf("error deriving key: %v", err) - } - // Strip off the checksum from the end - b, err := e.DecryptData(k, ciphertext[:len(ciphertext)-e.GetHMACBitLength()/8]) - if err != nil { - return nil, err - } - //Verify checksum - if !e.VerifyIntegrity(key, ciphertext, b, usage) { - return nil, errors.New("integrity verification failed") - } - //Remove the confounder bytes - return b[e.GetConfounderByteSize():], nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/keyDerivation.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/keyDerivation.go deleted file mode 100644 index fb402d9..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc3962/keyDerivation.go +++ /dev/null @@ -1,51 +0,0 @@ -package rfc3962 - -import ( - "encoding/binary" - "encoding/hex" - "errors" - - "github.com/jcmturner/gofork/x/crypto/pbkdf2" - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -const ( - s2kParamsZero = 4294967296 -) - -// StringToKey returns a key derived from the string provided according to the definition in RFC 3961. -func StringToKey(secret, salt, s2kparams string, e etype.EType) ([]byte, error) { - i, err := S2KparamsToItertions(s2kparams) - if err != nil { - return nil, err - } - return StringToKeyIter(secret, salt, i, e) -} - -// StringToPBKDF2 generates an encryption key from a pass phrase and salt string using the PBKDF2 function from PKCS #5 v2.0 -func StringToPBKDF2(secret, salt string, iterations int64, e etype.EType) []byte { - return pbkdf2.Key64([]byte(secret), []byte(salt), iterations, int64(e.GetKeyByteSize()), e.GetHashFunc()) -} - -// StringToKeyIter returns a key derived from the string provided according to the definition in RFC 3961. -func StringToKeyIter(secret, salt string, iterations int64, e etype.EType) ([]byte, error) { - tkey := e.RandomToKey(StringToPBKDF2(secret, salt, iterations, e)) - return e.DeriveKey(tkey, []byte("kerberos")) -} - -// S2KparamsToItertions converts the string representation of iterations to an integer -func S2KparamsToItertions(s2kparams string) (int64, error) { - //The s2kparams string should be hex string representing 4 bytes - //The 4 bytes represent a number in big endian order - //If the value is zero then the number of iterations should be 4,294,967,296 (2^32) - var i uint32 - if len(s2kparams) != 8 { - return int64(s2kParamsZero), errors.New("invalid s2kparams length") - } - b, err := hex.DecodeString(s2kparams) - if err != nil { - return int64(s2kParamsZero), errors.New("invalid s2kparams, cannot decode string to bytes") - } - i = binary.BigEndian.Uint32(b) - return int64(i), nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/checksum.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/checksum.go deleted file mode 100644 index 45276e9..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/checksum.go +++ /dev/null @@ -1,40 +0,0 @@ -package rfc4757 - -import ( - "bytes" - "crypto/hmac" - "crypto/md5" - "io" -) - -// Checksum returns a hash of the data in accordance with RFC 4757 -func Checksum(key []byte, usage uint32, data []byte) ([]byte, error) { - // Create hashing key - s := append([]byte(`signaturekey`), byte(0x00)) //includes zero octet at end - mac := hmac.New(md5.New, key) - mac.Write(s) - Ksign := mac.Sum(nil) - - // Format data - tb := UsageToMSMsgType(usage) - p := append(tb, data...) - h := md5.New() - rb := bytes.NewReader(p) - _, err := io.Copy(h, rb) - if err != nil { - return []byte{}, err - } - tmp := h.Sum(nil) - - // Generate HMAC - mac = hmac.New(md5.New, Ksign) - mac.Write(tmp) - return mac.Sum(nil), nil -} - -// HMAC returns a keyed MD5 checksum of the data -func HMAC(key []byte, data []byte) []byte { - mac := hmac.New(md5.New, key) - mac.Write(data) - return mac.Sum(nil) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/encryption.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/encryption.go deleted file mode 100644 index fdebe73..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/encryption.go +++ /dev/null @@ -1,80 +0,0 @@ -// Package rfc4757 provides encryption and checksum methods as specified in RFC 4757 -package rfc4757 - -import ( - "crypto/hmac" - "crypto/rand" - "crypto/rc4" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto/etype" -) - -// EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 4757. -func EncryptData(key, data []byte, e etype.EType) ([]byte, error) { - if len(key) != e.GetKeyByteSize() { - return []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - rc4Cipher, err := rc4.NewCipher(key) - if err != nil { - return []byte{}, fmt.Errorf("error creating RC4 cipher: %v", err) - } - ed := make([]byte, len(data)) - copy(ed, data) - rc4Cipher.XORKeyStream(ed, ed) - rc4Cipher.Reset() - return ed, nil -} - -// DecryptData decrypts the data provided using the methods specific to the etype provided as defined in RFC 4757. -func DecryptData(key, data []byte, e etype.EType) ([]byte, error) { - return EncryptData(key, data, e) -} - -// EncryptMessage encrypts the message provided using the methods specific to the etype provided as defined in RFC 4757. -// The encrypted data is concatenated with its RC4 header containing integrity checksum and confounder to create an encrypted message. -func EncryptMessage(key, data []byte, usage uint32, export bool, e etype.EType) ([]byte, error) { - confounder := make([]byte, e.GetConfounderByteSize()) // size = 8 - _, err := rand.Read(confounder) - if err != nil { - return []byte{}, fmt.Errorf("error generating confounder: %v", err) - } - k1 := key - k2 := HMAC(k1, UsageToMSMsgType(usage)) - toenc := append(confounder, data...) - chksum := HMAC(k2, toenc) - k3 := HMAC(k2, chksum) - - ed, err := EncryptData(k3, toenc, e) - if err != nil { - return []byte{}, fmt.Errorf("error encrypting data: %v", err) - } - - msg := append(chksum, ed...) - return msg, nil -} - -// DecryptMessage decrypts the message provided using the methods specific to the etype provided as defined in RFC 4757. -// The integrity of the message is also verified. -func DecryptMessage(key, data []byte, usage uint32, export bool, e etype.EType) ([]byte, error) { - checksum := data[:e.GetHMACBitLength()/8] - ct := data[e.GetHMACBitLength()/8:] - _, k2, k3 := deriveKeys(key, checksum, usage, export) - - pt, err := DecryptData(k3, ct, e) - if err != nil { - return []byte{}, fmt.Errorf("error decrypting data: %v", err) - } - - if !VerifyIntegrity(k2, pt, data, e) { - return []byte{}, errors.New("integrity checksum incorrect") - } - return pt[e.GetConfounderByteSize():], nil -} - -// VerifyIntegrity checks the integrity checksum of the data matches that calculated from the decrypted data. -func VerifyIntegrity(key, pt, data []byte, e etype.EType) bool { - chksum := HMAC(key, pt) - return hmac.Equal(chksum, data[:e.GetHMACBitLength()/8]) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/keyDerivation.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/keyDerivation.go deleted file mode 100644 index d1f90c0..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/keyDerivation.go +++ /dev/null @@ -1,40 +0,0 @@ -package rfc4757 - -import ( - "bytes" - "encoding/hex" - "errors" - "fmt" - "io" - - "golang.org/x/crypto/md4" -) - -// StringToKey returns a key derived from the string provided according to the definition in RFC 4757. -func StringToKey(secret string) ([]byte, error) { - b := make([]byte, len(secret)*2, len(secret)*2) - for i, r := range secret { - u := fmt.Sprintf("%04x", r) - c, err := hex.DecodeString(u) - if err != nil { - return []byte{}, errors.New("character could not be encoded") - } - // Swap round the two bytes to make little endian as we put into byte slice - b[2*i] = c[1] - b[2*i+1] = c[0] - } - r := bytes.NewReader(b) - h := md4.New() - _, err := io.Copy(h, r) - if err != nil { - return []byte{}, err - } - return h.Sum(nil), nil -} - -func deriveKeys(key, checksum []byte, usage uint32, export bool) (k1, k2, k3 []byte) { - k1 = key - k2 = HMAC(k1, UsageToMSMsgType(usage)) - k3 = HMAC(k2, checksum) - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/msgtype.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/msgtype.go deleted file mode 100644 index 068588d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc4757/msgtype.go +++ /dev/null @@ -1,20 +0,0 @@ -package rfc4757 - -import "encoding/binary" - -// UsageToMSMsgType converts Kerberos key usage numbers to Microsoft message type encoded as a little-endian four byte slice. -func UsageToMSMsgType(usage uint32) []byte { - // Translate usage numbers to the Microsoft T numbers - switch usage { - case 3: - usage = 8 - case 9: - usage = 8 - case 23: - usage = 13 - } - // Now convert to bytes - tb := make([]byte, 4) // We force an int32 input so we can't go over 4 bytes - binary.PutUvarint(tb, uint64(usage)) - return tb -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/encryption.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/encryption.go deleted file mode 100644 index 54cff7b..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/encryption.go +++ /dev/null @@ -1,125 +0,0 @@ -// Package rfc8009 provides encryption and checksum methods as specified in RFC 8009 -package rfc8009 - -import ( - "crypto/aes" - "crypto/hmac" - "crypto/rand" - "errors" - "fmt" - - "github.com/jcmturner/aescts/v2" - "github.com/jcmturner/gokrb5/v8/crypto/common" - "github.com/jcmturner/gokrb5/v8/crypto/etype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" -) - -// EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 8009. -func EncryptData(key, data []byte, e etype.EType) ([]byte, []byte, error) { - kl := e.GetKeyByteSize() - if e.GetETypeID() == etypeID.AES256_CTS_HMAC_SHA384_192 { - kl = 32 - } - if len(key) != kl { - return []byte{}, []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", e.GetKeyByteSize(), len(key)) - } - ivz := make([]byte, aes.BlockSize) - return aescts.Encrypt(key, ivz, data) -} - -// EncryptMessage encrypts the message provided using the methods specific to the etype provided as defined in RFC 8009. -// The encrypted data is concatenated with its integrity hash to create an encrypted message. -func EncryptMessage(key, message []byte, usage uint32, e etype.EType) ([]byte, []byte, error) { - kl := e.GetKeyByteSize() - if e.GetETypeID() == etypeID.AES256_CTS_HMAC_SHA384_192 { - kl = 32 - } - if len(key) != kl { - return []byte{}, []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", kl, len(key)) - } - if len(key) != e.GetKeyByteSize() { - } - //confounder - c := make([]byte, e.GetConfounderByteSize()) - _, err := rand.Read(c) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("could not generate random confounder: %v", err) - } - plainBytes := append(c, message...) - - // Derive key for encryption from usage - var k []byte - if usage != 0 { - k, err = e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return []byte{}, []byte{}, fmt.Errorf("error deriving key for encryption: %v", err) - } - } - - // Encrypt the data - iv, b, err := e.EncryptData(k, plainBytes) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - - ivz := make([]byte, e.GetConfounderByteSize()) - ih, err := GetIntegityHash(ivz, b, key, usage, e) - if err != nil { - return iv, b, fmt.Errorf("error encrypting data: %v", err) - } - b = append(b, ih...) - return iv, b, nil -} - -// DecryptData decrypts the data provided using the methods specific to the etype provided as defined in RFC 8009. -func DecryptData(key, data []byte, e etype.EType) ([]byte, error) { - kl := e.GetKeyByteSize() - if e.GetETypeID() == etypeID.AES256_CTS_HMAC_SHA384_192 { - kl = 32 - } - if len(key) != kl { - return []byte{}, fmt.Errorf("incorrect keysize: expected: %v actual: %v", kl, len(key)) - } - ivz := make([]byte, aes.BlockSize) - return aescts.Decrypt(key, ivz, data) -} - -// DecryptMessage decrypts the message provided using the methods specific to the etype provided as defined in RFC 8009. -// The integrity of the message is also verified. -func DecryptMessage(key, ciphertext []byte, usage uint32, e etype.EType) ([]byte, error) { - //Derive the key - k, err := e.DeriveKey(key, common.GetUsageKe(usage)) - if err != nil { - return nil, fmt.Errorf("error deriving key: %v", err) - } - // Strip off the checksum from the end - b, err := e.DecryptData(k, ciphertext[:len(ciphertext)-e.GetHMACBitLength()/8]) - if err != nil { - return nil, err - } - //Verify checksum - if !e.VerifyIntegrity(key, ciphertext, b, usage) { - return nil, errors.New("integrity verification failed") - } - //Remove the confounder bytes - return b[e.GetConfounderByteSize():], nil -} - -// GetIntegityHash returns a keyed integrity hash of the bytes provided as defined in RFC 8009 -func GetIntegityHash(iv, c, key []byte, usage uint32, e etype.EType) ([]byte, error) { - // Generate and append integrity hash - // Rather than calculating the hash over the confounder and plaintext - // it is calculated over the iv concatenated with the AES cipher output. - ib := append(iv, c...) - return common.GetIntegrityHash(ib, key, usage, e) -} - -// VerifyIntegrity verifies the integrity of cipertext bytes ct. -func VerifyIntegrity(key, ct []byte, usage uint32, etype etype.EType) bool { - h := make([]byte, etype.GetHMACBitLength()/8) - copy(h, ct[len(ct)-etype.GetHMACBitLength()/8:]) - ivz := make([]byte, etype.GetConfounderByteSize()) - ib := append(ivz, ct[:len(ct)-(etype.GetHMACBitLength()/8)]...) - expectedMAC, _ := common.GetIntegrityHash(ib, key, usage, etype) - return hmac.Equal(h, expectedMAC) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/keyDerivation.go b/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/keyDerivation.go deleted file mode 100644 index e947322..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/crypto/rfc8009/keyDerivation.go +++ /dev/null @@ -1,135 +0,0 @@ -package rfc8009 - -import ( - "crypto/hmac" - "encoding/binary" - "encoding/hex" - "errors" - - "github.com/jcmturner/gokrb5/v8/crypto/etype" - "github.com/jcmturner/gokrb5/v8/iana/etypeID" - "golang.org/x/crypto/pbkdf2" -) - -const ( - s2kParamsZero = 32768 -) - -// DeriveRandom for key derivation as defined in RFC 8009 -func DeriveRandom(protocolKey, usage []byte, e etype.EType) ([]byte, error) { - h := e.GetHashFunc()() - return KDF_HMAC_SHA2(protocolKey, []byte("prf"), usage, h.Size(), e), nil -} - -// DeriveKey derives a key from the protocol key based on the usage and the etype's specific methods. -// -// https://tools.ietf.org/html/rfc8009#section-5 -func DeriveKey(protocolKey, label []byte, e etype.EType) []byte { - var context []byte - var kl int - // Key length is longer for aes256-cts-hmac-sha384-192 is it is a Ke or from StringToKey (where label is "kerberos") - if e.GetETypeID() == etypeID.AES256_CTS_HMAC_SHA384_192 { - Swtch: - switch label[len(label)-1] { - case 0x73: - // 0x73 is "s" so label could be kerberos meaning StringToKey so now check if the label is "kerberos" - kerblabel := []byte("kerberos") - if len(label) != len(kerblabel) { - break - } - for i, b := range label { - if b != kerblabel[i] { - kl = e.GetKeySeedBitLength() - break Swtch - } - } - if kl == 0 { - // This is StringToKey - kl = 256 - } - case 0xAA: - // This is a Ke - kl = 256 - } - } - if kl == 0 { - kl = e.GetKeySeedBitLength() - } - return e.RandomToKey(KDF_HMAC_SHA2(protocolKey, label, context, kl, e)) -} - -// RandomToKey returns a key from the bytes provided according to the definition in RFC 8009. -func RandomToKey(b []byte) []byte { - return b -} - -// StringToKey returns a key derived from the string provided according to the definition in RFC 8009. -func StringToKey(secret, salt, s2kparams string, e etype.EType) ([]byte, error) { - i, err := S2KparamsToItertions(s2kparams) - if err != nil { - return nil, err - } - return StringToKeyIter(secret, salt, i, e) -} - -// StringToKeyIter returns a key derived from the string provided according to the definition in RFC 8009. -func StringToKeyIter(secret, salt string, iterations int, e etype.EType) ([]byte, error) { - tkey := e.RandomToKey(StringToPBKDF2(secret, salt, iterations, e)) - return e.DeriveKey(tkey, []byte("kerberos")) -} - -// StringToPBKDF2 generates an encryption key from a pass phrase and salt string using the PBKDF2 function from PKCS #5 v2.0 -func StringToPBKDF2(secret, salt string, iterations int, e etype.EType) []byte { - kl := e.GetKeyByteSize() - if e.GetETypeID() == etypeID.AES256_CTS_HMAC_SHA384_192 { - kl = 32 - } - return pbkdf2.Key([]byte(secret), []byte(salt), iterations, kl, e.GetHashFunc()) -} - -// KDF_HMAC_SHA2 key derivation: https://tools.ietf.org/html/rfc8009#section-3 -func KDF_HMAC_SHA2(protocolKey, label, context []byte, kl int, e etype.EType) []byte { - //k: Length in bits of the key to be outputted, expressed in big-endian binary representation in 4 bytes. - k := make([]byte, 4, 4) - binary.BigEndian.PutUint32(k, uint32(kl)) - - c := make([]byte, 4, 4) - binary.BigEndian.PutUint32(c, uint32(1)) - c = append(c, label...) - c = append(c, byte(0)) - if len(context) > 0 { - c = append(c, context...) - } - c = append(c, k...) - - mac := hmac.New(e.GetHashFunc(), protocolKey) - mac.Write(c) - return mac.Sum(nil)[:(kl / 8)] -} - -// GetSaltP returns the salt value based on the etype name: https://tools.ietf.org/html/rfc8009#section-4 -func GetSaltP(salt, ename string) string { - b := []byte(ename) - b = append(b, byte(0)) - b = append(b, []byte(salt)...) - return string(b) -} - -// S2KparamsToItertions converts the string representation of iterations to an integer for RFC 8009. -func S2KparamsToItertions(s2kparams string) (int, error) { - var i uint32 - if len(s2kparams) != 8 { - return s2kParamsZero, errors.New("Invalid s2kparams length") - } - b, err := hex.DecodeString(s2kparams) - if err != nil { - return s2kParamsZero, errors.New("Invalid s2kparams, cannot decode string to bytes") - } - i = binary.BigEndian.Uint32(b) - //buf := bytes.NewBuffer(b) - //err = binary.Read(buf, binary.BigEndian, &i) - if err != nil { - return s2kParamsZero, errors.New("Invalid s2kparams, cannot convert to big endian int32") - } - return int(i), nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/MICToken.go b/vendor/github.com/jcmturner/gokrb5/v8/gssapi/MICToken.go deleted file mode 100644 index ab8daa2..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/MICToken.go +++ /dev/null @@ -1,174 +0,0 @@ -package gssapi - -import ( - "bytes" - "crypto/hmac" - "encoding/binary" - "encoding/hex" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/types" -) - -// RFC 4121, section 4.2.6.1 - -const ( - // MICTokenFlagSentByAcceptor - this flag indicates the sender is the context acceptor. When not set, it indicates the sender is the context initiator - MICTokenFlagSentByAcceptor = 1 << iota - // MICTokenFlagSealed - this flag indicates confidentiality is provided for. It SHALL NOT be set in MIC tokens - MICTokenFlagSealed - // MICTokenFlagAcceptorSubkey - a subkey asserted by the context acceptor is used to protect the message - MICTokenFlagAcceptorSubkey -) - -const ( - micHdrLen = 16 // Length of the MIC Token's header -) - -// MICToken represents a GSS API MIC token, as defined in RFC 4121. -// It contains the header fields, the payload (this is not transmitted) and -// the checksum, and provides the logic for converting to/from bytes plus -// computing and verifying checksums -type MICToken struct { - // const GSS Token ID: 0x0404 - Flags byte // contains three flags: acceptor, sealed, acceptor subkey - // const Filler: 0xFF 0xFF 0xFF 0xFF 0xFF - SndSeqNum uint64 // sender's sequence number. big-endian - Payload []byte // your data! :) - Checksum []byte // checksum of { payload | header } -} - -// Return the 2 bytes identifying a GSS API MIC token -func getGSSMICTokenID() *[2]byte { - return &[2]byte{0x04, 0x04} -} - -// Return the filler bytes used in header -func fillerBytes() *[5]byte { - return &[5]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF} -} - -// Marshal the MICToken into a byte slice. -// The payload should have been set and the checksum computed, otherwise an error is returned. -func (mt *MICToken) Marshal() ([]byte, error) { - if mt.Checksum == nil { - return nil, errors.New("checksum has not been set") - } - - bytes := make([]byte, micHdrLen+len(mt.Checksum)) - copy(bytes[0:micHdrLen], mt.getMICChecksumHeader()[:]) - copy(bytes[micHdrLen:], mt.Checksum) - - return bytes, nil -} - -// SetChecksum uses the passed encryption key and key usage to compute the checksum over the payload and -// the header, and sets the Checksum field of this MICToken. -// If the payload has not been set or the checksum has already been set, an error is returned. -func (mt *MICToken) SetChecksum(key types.EncryptionKey, keyUsage uint32) error { - if mt.Checksum != nil { - return errors.New("checksum has already been computed") - } - checksum, err := mt.checksum(key, keyUsage) - if err != nil { - return err - } - mt.Checksum = checksum - return nil -} - -// Compute and return the checksum of this token, computed using the passed key and key usage. -// Note: This will NOT update the struct's Checksum field. -func (mt *MICToken) checksum(key types.EncryptionKey, keyUsage uint32) ([]byte, error) { - if mt.Payload == nil { - return nil, errors.New("cannot compute checksum with uninitialized payload") - } - d := make([]byte, micHdrLen+len(mt.Payload)) - copy(d[0:], mt.Payload) - copy(d[len(mt.Payload):], mt.getMICChecksumHeader()) - - encType, err := crypto.GetEtype(key.KeyType) - if err != nil { - return nil, err - } - return encType.GetChecksumHash(key.KeyValue, d, keyUsage) -} - -// Build a header suitable for a checksum computation -func (mt *MICToken) getMICChecksumHeader() []byte { - header := make([]byte, micHdrLen) - copy(header[0:2], getGSSMICTokenID()[:]) - header[2] = mt.Flags - copy(header[3:8], fillerBytes()[:]) - binary.BigEndian.PutUint64(header[8:16], mt.SndSeqNum) - return header -} - -// Verify computes the token's checksum with the provided key and usage, -// and compares it to the checksum present in the token. -// In case of any failure, (false, err) is returned, with err an explanatory error. -func (mt *MICToken) Verify(key types.EncryptionKey, keyUsage uint32) (bool, error) { - computed, err := mt.checksum(key, keyUsage) - if err != nil { - return false, err - } - if !hmac.Equal(computed, mt.Checksum) { - return false, fmt.Errorf( - "checksum mismatch. Computed: %s, Contained in token: %s", - hex.EncodeToString(computed), hex.EncodeToString(mt.Checksum)) - } - return true, nil -} - -// Unmarshal bytes into the corresponding MICToken. -// If expectFromAcceptor is true we expect the token to have been emitted by the gss acceptor, -// and will check the according flag, returning an error if the token does not match the expectation. -func (mt *MICToken) Unmarshal(b []byte, expectFromAcceptor bool) error { - if len(b) < micHdrLen { - return errors.New("bytes shorter than header length") - } - if !bytes.Equal(getGSSMICTokenID()[:], b[0:2]) { - return fmt.Errorf("wrong Token ID, Expected %s, was %s", - hex.EncodeToString(getGSSMICTokenID()[:]), - hex.EncodeToString(b[0:2])) - } - flags := b[2] - isFromAcceptor := flags&MICTokenFlagSentByAcceptor != 0 - if isFromAcceptor && !expectFromAcceptor { - return errors.New("unexpected acceptor flag is set: not expecting a token from the acceptor") - } - if !isFromAcceptor && expectFromAcceptor { - return errors.New("unexpected acceptor flag is not set: expecting a token from the acceptor, not in the initiator") - } - if !bytes.Equal(b[3:8], fillerBytes()[:]) { - return fmt.Errorf("unexpected filler bytes: expecting %s, was %s", - hex.EncodeToString(fillerBytes()[:]), - hex.EncodeToString(b[3:8])) - } - - mt.Flags = flags - mt.SndSeqNum = binary.BigEndian.Uint64(b[8:16]) - mt.Checksum = b[micHdrLen:] - return nil -} - -// NewInitiatorMICToken builds a new initiator token (acceptor flag will be set to 0) and computes the authenticated checksum. -// Other flags are set to 0. -// Note that in certain circumstances you may need to provide a sequence number that has been defined earlier. -// This is currently not supported. -func NewInitiatorMICToken(payload []byte, key types.EncryptionKey) (*MICToken, error) { - token := MICToken{ - Flags: 0x00, - SndSeqNum: 0, - Payload: payload, - } - - if err := token.SetChecksum(key, keyusage.GSSAPI_INITIATOR_SIGN); err != nil { - return nil, err - } - - return &token, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/README.md b/vendor/github.com/jcmturner/gokrb5/v8/gssapi/README.md deleted file mode 100644 index 8fdcf70..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Notes on GSS-API Negotiation Mechanism -https://tools.ietf.org/html/rfc4178 - -Client sends an initial negotiation message to the server which specifies the list of mechanisms -the client can support in order of decreasing preference. -This message is generated with the ``NewNegTokenInitKrb5`` method. -The message generated by this function specifies only a kerberos v5 mechanism is supported. - -The RFC states that this message can optionally contain the initial mechanism token -for the preferred mechanism (KRB5 in this case) of the client. The ``NewNegTokenInitKrb5`` -includes this in the message. - -The server side responds to this message with a one of four messages: - -| Message Type/State | Description | -|--------------------|-------------| -| accept-completed | indicates that the initiator-selected mechanism was acceptable to the target, and that the security mechanism token embedded in the first negotiation message was sufficient to complete the authentication | -| accept-incomplete | At least one more message is needed from the client to establish security context. | -| reject | Negotiation is being terminated. | -| request-mic | (this state can only be present in the first reply message from the target) indicates that the MIC token exchange is REQUIRED if per-message integrity services are available | \ No newline at end of file diff --git a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/contextFlags.go b/vendor/github.com/jcmturner/gokrb5/v8/gssapi/contextFlags.go deleted file mode 100644 index 6634c6d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/contextFlags.go +++ /dev/null @@ -1,25 +0,0 @@ -package gssapi - -import "github.com/jcmturner/gofork/encoding/asn1" - -// GSS-API context flags assigned numbers. -const ( - ContextFlagDeleg = 1 - ContextFlagMutual = 2 - ContextFlagReplay = 4 - ContextFlagSequence = 8 - ContextFlagConf = 16 - ContextFlagInteg = 32 - ContextFlagAnon = 64 -) - -// ContextFlags flags for GSSAPI -type ContextFlags asn1.BitString - -// NewContextFlags creates a new ContextFlags instance. -func NewContextFlags() ContextFlags { - var c ContextFlags - c.BitLength = 32 - c.Bytes = make([]byte, 4) - return c -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/gssapi.go b/vendor/github.com/jcmturner/gokrb5/v8/gssapi/gssapi.go deleted file mode 100644 index 8082231..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/gssapi.go +++ /dev/null @@ -1,202 +0,0 @@ -// Package gssapi implements Generic Security Services Application Program Interface required for SPNEGO kerberos authentication. -package gssapi - -import ( - "context" - "fmt" - - "github.com/jcmturner/gofork/encoding/asn1" -) - -// GSS-API OID names -const ( - // GSS-API OID names - OIDKRB5 OIDName = "KRB5" // MechType OID for Kerberos 5 - OIDMSLegacyKRB5 OIDName = "MSLegacyKRB5" // MechType OID for Kerberos 5 - OIDSPNEGO OIDName = "SPNEGO" - OIDGSSIAKerb OIDName = "GSSIAKerb" // Indicates the client cannot get a service ticket and asks the server to serve as an intermediate to the target KDC. http://k5wiki.kerberos.org/wiki/Projects/IAKERB#IAKERB_mech -) - -// GSS-API status values -const ( - StatusBadBindings = 1 << iota - StatusBadMech - StatusBadName - StatusBadNameType - StatusBadStatus - StatusBadSig - StatusBadMIC - StatusContextExpired - StatusCredentialsExpired - StatusDefectiveCredential - StatusDefectiveToken - StatusFailure - StatusNoContext - StatusNoCred - StatusBadQOP - StatusUnauthorized - StatusUnavailable - StatusDuplicateElement - StatusNameNotMN - StatusComplete - StatusContinueNeeded - StatusDuplicateToken - StatusOldToken - StatusUnseqToken - StatusGapToken -) - -// ContextToken is an interface for a GSS-API context token. -type ContextToken interface { - Marshal() ([]byte, error) - Unmarshal(b []byte) error - Verify() (bool, Status) - Context() context.Context -} - -/* -CREDENTIAL MANAGEMENT - -GSS_Acquire_cred acquire credentials for use -GSS_Release_cred release credentials after use -GSS_Inquire_cred display information about credentials -GSS_Add_cred construct credentials incrementally -GSS_Inquire_cred_by_mech display per-mechanism credential information - -CONTEXT-LEVEL CALLS - -GSS_Init_sec_context initiate outbound security context -GSS_Accept_sec_context accept inbound security context -GSS_Delete_sec_context flush context when no longer needed -GSS_Process_context_token process received control token on context -GSS_Context_time indicate validity time remaining on context -GSS_Inquire_context display information about context -GSS_Wrap_size_limit determine GSS_Wrap token size limit -GSS_Export_sec_context transfer context to other process -GSS_Import_sec_context import transferred context - -PER-MESSAGE CALLS - -GSS_GetMIC apply integrity check, receive as token separate from message -GSS_VerifyMIC validate integrity check token along with message -GSS_Wrap sign, optionally encrypt, encapsulate -GSS_Unwrap decapsulate, decrypt if needed, validate integrity check - -SUPPORT CALLS - -GSS_Display_status translate status codes to printable form -GSS_Indicate_mechs indicate mech_types supported on local system -GSS_Compare_name compare two names for equality -GSS_Display_name translate name to printable form -GSS_Import_name convert printable name to normalized form -GSS_Release_name free storage of normalized-form name -GSS_Release_buffer free storage of general GSS-allocated object -GSS_Release_OID_set free storage of OID set object -GSS_Create_empty_OID_set create empty OID set -GSS_Add_OID_set_member add member to OID set -GSS_Test_OID_set_member test if OID is member of OID set -GSS_Inquire_names_for_mech indicate name types supported by mechanism -GSS_Inquire_mechs_for_name indicates mechanisms supporting name type -GSS_Canonicalize_name translate name to per-mechanism form -GSS_Export_name externalize per-mechanism name -GSS_Duplicate_name duplicate name object -*/ - -// Mechanism is the GSS-API interface for authentication mechanisms. -type Mechanism interface { - OID() asn1.ObjectIdentifier - AcquireCred() error // acquire credentials for use (eg. AS exchange for KRB5) - InitSecContext() (ContextToken, error) // initiate outbound security context (eg TGS exchange builds AP_REQ to go into ContextToken to send to service) - AcceptSecContext(ct ContextToken) (bool, context.Context, Status) // service verifies the token server side to establish a context - MIC() MICToken // apply integrity check, receive as token separate from message - VerifyMIC(mt MICToken) (bool, error) // validate integrity check token along with message - Wrap(msg []byte) WrapToken // sign, optionally encrypt, encapsulate - Unwrap(wt WrapToken) []byte // decapsulate, decrypt if needed, validate integrity check -} - -// OIDName is the type for defined GSS-API OIDs. -type OIDName string - -// OID returns the OID for the provided OID name. -func (o OIDName) OID() asn1.ObjectIdentifier { - switch o { - case OIDSPNEGO: - return asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 2} - case OIDKRB5: - return asn1.ObjectIdentifier{1, 2, 840, 113554, 1, 2, 2} - case OIDMSLegacyKRB5: - return asn1.ObjectIdentifier{1, 2, 840, 48018, 1, 2, 2} - case OIDGSSIAKerb: - return asn1.ObjectIdentifier{1, 3, 6, 1, 5, 2, 5} - } - return asn1.ObjectIdentifier{} -} - -// Status is the GSS-API status and implements the error interface. -type Status struct { - Code int - Message string -} - -// Error returns the Status description. -func (s Status) Error() string { - var str string - switch s.Code { - case StatusBadBindings: - str = "channel binding mismatch" - case StatusBadMech: - str = "unsupported mechanism requested" - case StatusBadName: - str = "invalid name provided" - case StatusBadNameType: - str = "name of unsupported type provided" - case StatusBadStatus: - str = "invalid input status selector" - case StatusBadSig: - str = "token had invalid integrity check" - case StatusBadMIC: - str = "preferred alias for GSS_S_BAD_SIG" - case StatusContextExpired: - str = "specified security context expired" - case StatusCredentialsExpired: - str = "expired credentials detected" - case StatusDefectiveCredential: - str = "defective credential detected" - case StatusDefectiveToken: - str = "defective token detected" - case StatusFailure: - str = "failure, unspecified at GSS-API level" - case StatusNoContext: - str = "no valid security context specified" - case StatusNoCred: - str = "no valid credentials provided" - case StatusBadQOP: - str = "unsupported QOP valu" - case StatusUnauthorized: - str = "operation unauthorized" - case StatusUnavailable: - str = "operation unavailable" - case StatusDuplicateElement: - str = "duplicate credential element requested" - case StatusNameNotMN: - str = "name contains multi-mechanism elements" - case StatusComplete: - str = "normal completion" - case StatusContinueNeeded: - str = "continuation call to routine required" - case StatusDuplicateToken: - str = "duplicate per-message token detected" - case StatusOldToken: - str = "timed-out per-message token detected" - case StatusUnseqToken: - str = "reordered (early) per-message token detected" - case StatusGapToken: - str = "skipped predecessor token(s) detected" - default: - str = "unknown GSS-API error status" - } - if s.Message != "" { - return fmt.Sprintf("%s: %s", str, s.Message) - } - return str -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/wrapToken.go b/vendor/github.com/jcmturner/gokrb5/v8/gssapi/wrapToken.go deleted file mode 100644 index c521139..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/gssapi/wrapToken.go +++ /dev/null @@ -1,193 +0,0 @@ -package gssapi - -import ( - "bytes" - "crypto/hmac" - "encoding/binary" - "encoding/hex" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/types" -) - -// RFC 4121, section 4.2.6.2 - -const ( - HdrLen = 16 // Length of the Wrap Token's header - FillerByte byte = 0xFF -) - -// WrapToken represents a GSS API Wrap token, as defined in RFC 4121. -// It contains the header fields, the payload and the checksum, and provides -// the logic for converting to/from bytes plus computing and verifying checksums -type WrapToken struct { - // const GSS Token ID: 0x0504 - Flags byte // contains three flags: acceptor, sealed, acceptor subkey - // const Filler: 0xFF - EC uint16 // checksum length. big-endian - RRC uint16 // right rotation count. big-endian - SndSeqNum uint64 // sender's sequence number. big-endian - Payload []byte // your data! :) - CheckSum []byte // authenticated checksum of { payload | header } -} - -// Return the 2 bytes identifying a GSS API Wrap token -func getGssWrapTokenId() *[2]byte { - return &[2]byte{0x05, 0x04} -} - -// Marshal the WrapToken into a byte slice. -// The payload should have been set and the checksum computed, otherwise an error is returned. -func (wt *WrapToken) Marshal() ([]byte, error) { - if wt.CheckSum == nil { - return nil, errors.New("checksum has not been set") - } - if wt.Payload == nil { - return nil, errors.New("payload has not been set") - } - - pldOffset := HdrLen // Offset of the payload in the token - chkSOffset := HdrLen + len(wt.Payload) // Offset of the checksum in the token - - bytes := make([]byte, chkSOffset+int(wt.EC)) - copy(bytes[0:], getGssWrapTokenId()[:]) - bytes[2] = wt.Flags - bytes[3] = FillerByte - binary.BigEndian.PutUint16(bytes[4:6], wt.EC) - binary.BigEndian.PutUint16(bytes[6:8], wt.RRC) - binary.BigEndian.PutUint64(bytes[8:16], wt.SndSeqNum) - copy(bytes[pldOffset:], wt.Payload) - copy(bytes[chkSOffset:], wt.CheckSum) - return bytes, nil -} - -// SetCheckSum uses the passed encryption key and key usage to compute the checksum over the payload and -// the header, and sets the CheckSum field of this WrapToken. -// If the payload has not been set or the checksum has already been set, an error is returned. -func (wt *WrapToken) SetCheckSum(key types.EncryptionKey, keyUsage uint32) error { - if wt.Payload == nil { - return errors.New("payload has not been set") - } - if wt.CheckSum != nil { - return errors.New("checksum has already been computed") - } - chkSum, cErr := wt.computeCheckSum(key, keyUsage) - if cErr != nil { - return cErr - } - wt.CheckSum = chkSum - return nil -} - -// ComputeCheckSum computes and returns the checksum of this token, computed using the passed key and key usage. -// Note: This will NOT update the struct's Checksum field. -func (wt *WrapToken) computeCheckSum(key types.EncryptionKey, keyUsage uint32) ([]byte, error) { - if wt.Payload == nil { - return nil, errors.New("cannot compute checksum with uninitialized payload") - } - // Build a slice containing { payload | header } - checksumMe := make([]byte, HdrLen+len(wt.Payload)) - copy(checksumMe[0:], wt.Payload) - copy(checksumMe[len(wt.Payload):], getChecksumHeader(wt.Flags, wt.SndSeqNum)) - - encType, err := crypto.GetEtype(key.KeyType) - if err != nil { - return nil, err - } - return encType.GetChecksumHash(key.KeyValue, checksumMe, keyUsage) -} - -// Build a header suitable for a checksum computation -func getChecksumHeader(flags byte, senderSeqNum uint64) []byte { - header := make([]byte, 16) - copy(header[0:], []byte{0x05, 0x04, flags, 0xFF, 0x00, 0x00, 0x00, 0x00}) - binary.BigEndian.PutUint64(header[8:], senderSeqNum) - return header -} - -// Verify computes the token's checksum with the provided key and usage, -// and compares it to the checksum present in the token. -// In case of any failure, (false, Err) is returned, with Err an explanatory error. -func (wt *WrapToken) Verify(key types.EncryptionKey, keyUsage uint32) (bool, error) { - computed, cErr := wt.computeCheckSum(key, keyUsage) - if cErr != nil { - return false, cErr - } - if !hmac.Equal(computed, wt.CheckSum) { - return false, fmt.Errorf( - "checksum mismatch. Computed: %s, Contained in token: %s", - hex.EncodeToString(computed), hex.EncodeToString(wt.CheckSum)) - } - return true, nil -} - -// Unmarshal bytes into the corresponding WrapToken. -// If expectFromAcceptor is true, we expect the token to have been emitted by the gss acceptor, -// and will check the according flag, returning an error if the token does not match the expectation. -func (wt *WrapToken) Unmarshal(b []byte, expectFromAcceptor bool) error { - // Check if we can read a whole header - if len(b) < 16 { - return errors.New("bytes shorter than header length") - } - // Is the Token ID correct? - if !bytes.Equal(getGssWrapTokenId()[:], b[0:2]) { - return fmt.Errorf("wrong Token ID. Expected %s, was %s", - hex.EncodeToString(getGssWrapTokenId()[:]), - hex.EncodeToString(b[0:2])) - } - // Check the acceptor flag - flags := b[2] - isFromAcceptor := flags&0x01 == 1 - if isFromAcceptor && !expectFromAcceptor { - return errors.New("unexpected acceptor flag is set: not expecting a token from the acceptor") - } - if !isFromAcceptor && expectFromAcceptor { - return errors.New("expected acceptor flag is not set: expecting a token from the acceptor, not the initiator") - } - // Check the filler byte - if b[3] != FillerByte { - return fmt.Errorf("unexpected filler byte: expecting 0xFF, was %s ", hex.EncodeToString(b[3:4])) - } - checksumL := binary.BigEndian.Uint16(b[4:6]) - // Sanity check on the checksum length - if int(checksumL) > len(b)-HdrLen { - return fmt.Errorf("inconsistent checksum length: %d bytes to parse, checksum length is %d", len(b), checksumL) - } - - wt.Flags = flags - wt.EC = checksumL - wt.RRC = binary.BigEndian.Uint16(b[6:8]) - wt.SndSeqNum = binary.BigEndian.Uint64(b[8:16]) - wt.Payload = b[16 : len(b)-int(checksumL)] - wt.CheckSum = b[len(b)-int(checksumL):] - return nil -} - -// NewInitiatorWrapToken builds a new initiator token (acceptor flag will be set to 0) and computes the authenticated checksum. -// Other flags are set to 0, and the RRC and sequence number are initialized to 0. -// Note that in certain circumstances you may need to provide a sequence number that has been defined earlier. -// This is currently not supported. -func NewInitiatorWrapToken(payload []byte, key types.EncryptionKey) (*WrapToken, error) { - encType, err := crypto.GetEtype(key.KeyType) - if err != nil { - return nil, err - } - - token := WrapToken{ - Flags: 0x00, // all zeroed out (this is a token sent by the initiator) - // Checksum size: length of output of the HMAC function, in bytes. - EC: uint16(encType.GetHMACBitLength() / 8), - RRC: 0, - SndSeqNum: 0, - Payload: payload, - } - - if err := token.SetCheckSum(key, keyusage.GSSAPI_INITIATOR_SEAL); err != nil { - return nil, err - } - - return &token, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/addrtype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/addrtype/constants.go deleted file mode 100644 index 457b89d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/addrtype/constants.go +++ /dev/null @@ -1,15 +0,0 @@ -// Package addrtype provides Address type assigned numbers. -package addrtype - -// Address type IDs. -const ( - IPv4 int32 = 2 - Directional int32 = 3 - ChaosNet int32 = 5 - XNS int32 = 6 - ISO int32 = 7 - DECNETPhaseIV int32 = 12 - AppleTalkDDP int32 = 16 - NetBios int32 = 20 - IPv6 int32 = 24 -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/adtype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/adtype/constants.go deleted file mode 100644 index e805b74..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/adtype/constants.go +++ /dev/null @@ -1,23 +0,0 @@ -// Package adtype provides Authenticator type assigned numbers. -package adtype - -// Authenticator type IDs. -const ( - ADIfRelevant int32 = 1 - ADIntendedForServer int32 = 2 - ADIntendedForApplicationClass int32 = 3 - ADKDCIssued int32 = 4 - ADAndOr int32 = 5 - ADMandatoryTicketExtensions int32 = 6 - ADInTicketExtensions int32 = 7 - ADMandatoryForKDC int32 = 8 - OSFDCE int32 = 64 - SESAME int32 = 65 - ADOSFDCEPKICertID int32 = 66 - ADAuthenticationStrength int32 = 70 - ADFXFastArmor int32 = 71 - ADFXFastUsed int32 = 72 - ADWin2KPAC int32 = 128 - ADEtypeNegotiation int32 = 129 - //Reserved values 9-63 -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/asnAppTag/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/asnAppTag/constants.go deleted file mode 100644 index d74cd60..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/asnAppTag/constants.go +++ /dev/null @@ -1,24 +0,0 @@ -// Package asnAppTag provides ASN1 application tag numbers. -package asnAppTag - -// ASN1 application tag numbers. -const ( - Ticket = 1 - Authenticator = 2 - EncTicketPart = 3 - ASREQ = 10 - TGSREQ = 12 - ASREP = 11 - TGSREP = 13 - APREQ = 14 - APREP = 15 - KRBSafe = 20 - KRBPriv = 21 - KRBCred = 22 - EncASRepPart = 25 - EncTGSRepPart = 26 - EncAPRepPart = 27 - EncKrbPrivPart = 28 - EncKrbCredPart = 29 - KRBError = 30 -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/chksumtype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/chksumtype/constants.go deleted file mode 100644 index 93db952..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/chksumtype/constants.go +++ /dev/null @@ -1,32 +0,0 @@ -// Package chksumtype provides Kerberos 5 checksum type assigned numbers. -package chksumtype - -// Checksum type IDs. -const ( - //RESERVED : 0 - CRC32 int32 = 1 - RSA_MD4 int32 = 2 - RSA_MD4_DES int32 = 3 - DES_MAC int32 = 4 - DES_MAC_K int32 = 5 - RSA_MD4_DES_K int32 = 6 - RSA_MD5 int32 = 7 - RSA_MD5_DES int32 = 8 - RSA_MD5_DES3 int32 = 9 - SHA1_ID10 int32 = 10 - //UNASSIGNED : 11 - HMAC_SHA1_DES3_KD int32 = 12 - HMAC_SHA1_DES3 int32 = 13 - SHA1_ID14 int32 = 14 - HMAC_SHA1_96_AES128 int32 = 15 - HMAC_SHA1_96_AES256 int32 = 16 - CMAC_CAMELLIA128 int32 = 17 - CMAC_CAMELLIA256 int32 = 18 - HMAC_SHA256_128_AES128 int32 = 19 - HMAC_SHA384_192_AES256 int32 = 20 - //UNASSIGNED : 21-32770 - GSSAPI int32 = 32771 - //UNASSIGNED : 32772-2147483647 - KERB_CHECKSUM_HMAC_MD5_UNSIGNED uint32 = 4294967158 // 0xFFFFFF76 documentation says this is -138 but in an unsigned int this is 4294967158 - KERB_CHECKSUM_HMAC_MD5 int32 = -138 -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/constants.go deleted file mode 100644 index 0b8e916..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/constants.go +++ /dev/null @@ -1,5 +0,0 @@ -// Package iana provides Kerberos 5 assigned numbers. -package iana - -// PVNO is the Protocol Version Number. -const PVNO = 5 diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/errorcode/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/errorcode/constants.go deleted file mode 100644 index fd756bc..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/errorcode/constants.go +++ /dev/null @@ -1,155 +0,0 @@ -// Package errorcode provides Kerberos 5 assigned error codes. -package errorcode - -import "fmt" - -// Kerberos error codes. -const ( - KDC_ERR_NONE int32 = 0 //No error - KDC_ERR_NAME_EXP int32 = 1 //Client's entry in database has expired - KDC_ERR_SERVICE_EXP int32 = 2 //Server's entry in database has expired - KDC_ERR_BAD_PVNO int32 = 3 //Requested protocol version number not supported - KDC_ERR_C_OLD_MAST_KVNO int32 = 4 //Client's key encrypted in old master key - KDC_ERR_S_OLD_MAST_KVNO int32 = 5 //Server's key encrypted in old master key - KDC_ERR_C_PRINCIPAL_UNKNOWN int32 = 6 //Client not found in Kerberos database - KDC_ERR_S_PRINCIPAL_UNKNOWN int32 = 7 //Server not found in Kerberos database - KDC_ERR_PRINCIPAL_NOT_UNIQUE int32 = 8 //Multiple principal entries in database - KDC_ERR_NULL_KEY int32 = 9 //The client or server has a null key - KDC_ERR_CANNOT_POSTDATE int32 = 10 //Ticket not eligible for postdating - KDC_ERR_NEVER_VALID int32 = 11 //Requested starttime is later than end time - KDC_ERR_POLICY int32 = 12 //KDC policy rejects request - KDC_ERR_BADOPTION int32 = 13 //KDC cannot accommodate requested option - KDC_ERR_ETYPE_NOSUPP int32 = 14 //KDC has no support for encryption type - KDC_ERR_SUMTYPE_NOSUPP int32 = 15 //KDC has no support for checksum type - KDC_ERR_PADATA_TYPE_NOSUPP int32 = 16 //KDC has no support for padata type - KDC_ERR_TRTYPE_NOSUPP int32 = 17 //KDC has no support for transited type - KDC_ERR_CLIENT_REVOKED int32 = 18 //Clients credentials have been revoked - KDC_ERR_SERVICE_REVOKED int32 = 19 //Credentials for server have been revoked - KDC_ERR_TGT_REVOKED int32 = 20 //TGT has been revoked - KDC_ERR_CLIENT_NOTYET int32 = 21 //Client not yet valid; try again later - KDC_ERR_SERVICE_NOTYET int32 = 22 //Server not yet valid; try again later - KDC_ERR_KEY_EXPIRED int32 = 23 //Password has expired; change password to reset - KDC_ERR_PREAUTH_FAILED int32 = 24 //Pre-authentication information was invalid - KDC_ERR_PREAUTH_REQUIRED int32 = 25 //Additional pre-authentication required - KDC_ERR_SERVER_NOMATCH int32 = 26 //Requested server and ticket don't match - KDC_ERR_MUST_USE_USER2USER int32 = 27 //Server principal valid for user2user only - KDC_ERR_PATH_NOT_ACCEPTED int32 = 28 //KDC Policy rejects transited path - KDC_ERR_SVC_UNAVAILABLE int32 = 29 //A service is not available - KRB_AP_ERR_BAD_INTEGRITY int32 = 31 //Integrity check on decrypted field failed - KRB_AP_ERR_TKT_EXPIRED int32 = 32 //Ticket expired - KRB_AP_ERR_TKT_NYV int32 = 33 //Ticket not yet valid - KRB_AP_ERR_REPEAT int32 = 34 //Request is a replay - KRB_AP_ERR_NOT_US int32 = 35 //The ticket isn't for us - KRB_AP_ERR_BADMATCH int32 = 36 //Ticket and authenticator don't match - KRB_AP_ERR_SKEW int32 = 37 //Clock skew too great - KRB_AP_ERR_BADADDR int32 = 38 //Incorrect net address - KRB_AP_ERR_BADVERSION int32 = 39 //Protocol version mismatch - KRB_AP_ERR_MSG_TYPE int32 = 40 //Invalid msg type - KRB_AP_ERR_MODIFIED int32 = 41 //Message stream modified - KRB_AP_ERR_BADORDER int32 = 42 //Message out of order - KRB_AP_ERR_BADKEYVER int32 = 44 //Specified version of key is not available - KRB_AP_ERR_NOKEY int32 = 45 //Service key not available - KRB_AP_ERR_MUT_FAIL int32 = 46 //Mutual authentication failed - KRB_AP_ERR_BADDIRECTION int32 = 47 //Incorrect message direction - KRB_AP_ERR_METHOD int32 = 48 //Alternative authentication method required - KRB_AP_ERR_BADSEQ int32 = 49 //Incorrect sequence number in message - KRB_AP_ERR_INAPP_CKSUM int32 = 50 //Inappropriate type of checksum in message - KRB_AP_PATH_NOT_ACCEPTED int32 = 51 //Policy rejects transited path - KRB_ERR_RESPONSE_TOO_BIG int32 = 52 //Response too big for UDP; retry with TCP - KRB_ERR_GENERIC int32 = 60 //Generic error (description in e-text) - KRB_ERR_FIELD_TOOLONG int32 = 61 //Field is too long for this implementation - KDC_ERROR_CLIENT_NOT_TRUSTED int32 = 62 //Reserved for PKINIT - KDC_ERROR_KDC_NOT_TRUSTED int32 = 63 //Reserved for PKINIT - KDC_ERROR_INVALID_SIG int32 = 64 //Reserved for PKINIT - KDC_ERR_KEY_TOO_WEAK int32 = 65 //Reserved for PKINIT - KDC_ERR_CERTIFICATE_MISMATCH int32 = 66 //Reserved for PKINIT - KRB_AP_ERR_NO_TGT int32 = 67 //No TGT available to validate USER-TO-USER - KDC_ERR_WRONG_REALM int32 = 68 //Reserved for future use - KRB_AP_ERR_USER_TO_USER_REQUIRED int32 = 69 //Ticket must be for USER-TO-USER - KDC_ERR_CANT_VERIFY_CERTIFICATE int32 = 70 //Reserved for PKINIT - KDC_ERR_INVALID_CERTIFICATE int32 = 71 //Reserved for PKINIT - KDC_ERR_REVOKED_CERTIFICATE int32 = 72 //Reserved for PKINIT - KDC_ERR_REVOCATION_STATUS_UNKNOWN int32 = 73 //Reserved for PKINIT - KDC_ERR_REVOCATION_STATUS_UNAVAILABLE int32 = 74 //Reserved for PKINIT - KDC_ERR_CLIENT_NAME_MISMATCH int32 = 75 //Reserved for PKINIT - KDC_ERR_KDC_NAME_MISMATCH int32 = 76 //Reserved for PKINIT -) - -// Lookup an error code description. -func Lookup(i int32) string { - if s, ok := errorcodeLookup[i]; ok { - return fmt.Sprintf("(%d) %s", i, s) - } - return fmt.Sprintf("Unknown ErrorCode %d", i) -} - -var errorcodeLookup = map[int32]string{ - KDC_ERR_NONE: "KDC_ERR_NONE No error", - KDC_ERR_NAME_EXP: "KDC_ERR_NAME_EXP Client's entry in database has expired", - KDC_ERR_SERVICE_EXP: "KDC_ERR_SERVICE_EXP Server's entry in database has expired", - KDC_ERR_BAD_PVNO: "KDC_ERR_BAD_PVNO Requested protocol version number not supported", - KDC_ERR_C_OLD_MAST_KVNO: "KDC_ERR_C_OLD_MAST_KVNO Client's key encrypted in old master key", - KDC_ERR_S_OLD_MAST_KVNO: "KDC_ERR_S_OLD_MAST_KVNO Server's key encrypted in old master key", - KDC_ERR_C_PRINCIPAL_UNKNOWN: "KDC_ERR_C_PRINCIPAL_UNKNOWN Client not found in Kerberos database", - KDC_ERR_S_PRINCIPAL_UNKNOWN: "KDC_ERR_S_PRINCIPAL_UNKNOWN Server not found in Kerberos database", - KDC_ERR_PRINCIPAL_NOT_UNIQUE: "KDC_ERR_PRINCIPAL_NOT_UNIQUE Multiple principal entries in database", - KDC_ERR_NULL_KEY: "KDC_ERR_NULL_KEY The client or server has a null key", - KDC_ERR_CANNOT_POSTDATE: "KDC_ERR_CANNOT_POSTDATE Ticket not eligible for postdating", - KDC_ERR_NEVER_VALID: "KDC_ERR_NEVER_VALID Requested starttime is later than end time", - KDC_ERR_POLICY: "KDC_ERR_POLICY KDC policy rejects request", - KDC_ERR_BADOPTION: "KDC_ERR_BADOPTION KDC cannot accommodate requested option", - KDC_ERR_ETYPE_NOSUPP: "KDC_ERR_ETYPE_NOSUPP KDC has no support for encryption type", - KDC_ERR_SUMTYPE_NOSUPP: "KDC_ERR_SUMTYPE_NOSUPP KDC has no support for checksum type", - KDC_ERR_PADATA_TYPE_NOSUPP: "KDC_ERR_PADATA_TYPE_NOSUPP KDC has no support for padata type", - KDC_ERR_TRTYPE_NOSUPP: "KDC_ERR_TRTYPE_NOSUPP KDC has no support for transited type", - KDC_ERR_CLIENT_REVOKED: "KDC_ERR_CLIENT_REVOKED Clients credentials have been revoked", - KDC_ERR_SERVICE_REVOKED: "KDC_ERR_SERVICE_REVOKED Credentials for server have been revoked", - KDC_ERR_TGT_REVOKED: "KDC_ERR_TGT_REVOKED TGT has been revoked", - KDC_ERR_CLIENT_NOTYET: "KDC_ERR_CLIENT_NOTYET Client not yet valid; try again later", - KDC_ERR_SERVICE_NOTYET: "KDC_ERR_SERVICE_NOTYET Server not yet valid; try again later", - KDC_ERR_KEY_EXPIRED: "KDC_ERR_KEY_EXPIRED Password has expired; change password to reset", - KDC_ERR_PREAUTH_FAILED: "KDC_ERR_PREAUTH_FAILED Pre-authentication information was invalid", - KDC_ERR_PREAUTH_REQUIRED: "KDC_ERR_PREAUTH_REQUIRED Additional pre-authentication required", - KDC_ERR_SERVER_NOMATCH: "KDC_ERR_SERVER_NOMATCH Requested server and ticket don't match", - KDC_ERR_MUST_USE_USER2USER: "KDC_ERR_MUST_USE_USER2USER Server principal valid for user2user only", - KDC_ERR_PATH_NOT_ACCEPTED: "KDC_ERR_PATH_NOT_ACCEPTED KDC Policy rejects transited path", - KDC_ERR_SVC_UNAVAILABLE: "KDC_ERR_SVC_UNAVAILABLE A service is not available", - KRB_AP_ERR_BAD_INTEGRITY: "KRB_AP_ERR_BAD_INTEGRITY Integrity check on decrypted field failed", - KRB_AP_ERR_TKT_EXPIRED: "KRB_AP_ERR_TKT_EXPIRED Ticket expired", - KRB_AP_ERR_TKT_NYV: "KRB_AP_ERR_TKT_NYV Ticket not yet valid", - KRB_AP_ERR_REPEAT: "KRB_AP_ERR_REPEAT Request is a replay", - KRB_AP_ERR_NOT_US: "KRB_AP_ERR_NOT_US The ticket isn't for us", - KRB_AP_ERR_BADMATCH: "KRB_AP_ERR_BADMATCH Ticket and authenticator don't match", - KRB_AP_ERR_SKEW: "KRB_AP_ERR_SKEW Clock skew too great", - KRB_AP_ERR_BADADDR: "KRB_AP_ERR_BADADDR Incorrect net address", - KRB_AP_ERR_BADVERSION: "KRB_AP_ERR_BADVERSION Protocol version mismatch", - KRB_AP_ERR_MSG_TYPE: "KRB_AP_ERR_MSG_TYPE Invalid msg type", - KRB_AP_ERR_MODIFIED: "KRB_AP_ERR_MODIFIED Message stream modified", - KRB_AP_ERR_BADORDER: "KRB_AP_ERR_BADORDER Message out of order", - KRB_AP_ERR_BADKEYVER: "KRB_AP_ERR_BADKEYVER Specified version of key is not available", - KRB_AP_ERR_NOKEY: "KRB_AP_ERR_NOKEY Service key not available", - KRB_AP_ERR_MUT_FAIL: "KRB_AP_ERR_MUT_FAIL Mutual authentication failed", - KRB_AP_ERR_BADDIRECTION: "KRB_AP_ERR_BADDIRECTION Incorrect message direction", - KRB_AP_ERR_METHOD: "KRB_AP_ERR_METHOD Alternative authentication method required", - KRB_AP_ERR_BADSEQ: "KRB_AP_ERR_BADSEQ Incorrect sequence number in message", - KRB_AP_ERR_INAPP_CKSUM: "KRB_AP_ERR_INAPP_CKSUM Inappropriate type of checksum in message", - KRB_AP_PATH_NOT_ACCEPTED: "KRB_AP_PATH_NOT_ACCEPTED Policy rejects transited path", - KRB_ERR_RESPONSE_TOO_BIG: "KRB_ERR_RESPONSE_TOO_BIG Response too big for UDP; retry with TCP", - KRB_ERR_GENERIC: "KRB_ERR_GENERIC Generic error (description in e-text)", - KRB_ERR_FIELD_TOOLONG: "KRB_ERR_FIELD_TOOLONG Field is too long for this implementation", - KDC_ERROR_CLIENT_NOT_TRUSTED: "KDC_ERROR_CLIENT_NOT_TRUSTED Reserved for PKINIT", - KDC_ERROR_KDC_NOT_TRUSTED: "KDC_ERROR_KDC_NOT_TRUSTED Reserved for PKINIT", - KDC_ERROR_INVALID_SIG: "KDC_ERROR_INVALID_SIG Reserved for PKINIT", - KDC_ERR_KEY_TOO_WEAK: "KDC_ERR_KEY_TOO_WEAK Reserved for PKINIT", - KDC_ERR_CERTIFICATE_MISMATCH: "KDC_ERR_CERTIFICATE_MISMATCH Reserved for PKINIT", - KRB_AP_ERR_NO_TGT: "KRB_AP_ERR_NO_TGT No TGT available to validate USER-TO-USER", - KDC_ERR_WRONG_REALM: "KDC_ERR_WRONG_REALM Reserved for future use", - KRB_AP_ERR_USER_TO_USER_REQUIRED: "KRB_AP_ERR_USER_TO_USER_REQUIRED Ticket must be for USER-TO-USER", - KDC_ERR_CANT_VERIFY_CERTIFICATE: "KDC_ERR_CANT_VERIFY_CERTIFICATE Reserved for PKINIT", - KDC_ERR_INVALID_CERTIFICATE: "KDC_ERR_INVALID_CERTIFICATE Reserved for PKINIT", - KDC_ERR_REVOKED_CERTIFICATE: "KDC_ERR_REVOKED_CERTIFICATE Reserved for PKINIT", - KDC_ERR_REVOCATION_STATUS_UNKNOWN: "KDC_ERR_REVOCATION_STATUS_UNKNOWN Reserved for PKINIT", - KDC_ERR_REVOCATION_STATUS_UNAVAILABLE: "KDC_ERR_REVOCATION_STATUS_UNAVAILABLE Reserved for PKINIT", - KDC_ERR_CLIENT_NAME_MISMATCH: "KDC_ERR_CLIENT_NAME_MISMATCH Reserved for PKINIT", - KDC_ERR_KDC_NAME_MISMATCH: "KDC_ERR_KDC_NAME_MISMATCH Reserved for PKINIT", -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/etypeID/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/etypeID/constants.go deleted file mode 100644 index 46a0d74..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/etypeID/constants.go +++ /dev/null @@ -1,101 +0,0 @@ -// Package etypeID provides Kerberos 5 encryption type assigned numbers. -package etypeID - -// Kerberos encryption type assigned numbers. -const ( - //RESERVED : 0 - DES_CBC_CRC int32 = 1 - DES_CBC_MD4 int32 = 2 - DES_CBC_MD5 int32 = 3 - DES_CBC_RAW int32 = 4 - DES3_CBC_MD5 int32 = 5 - DES3_CBC_RAW int32 = 6 - DES3_CBC_SHA1 int32 = 7 - DES_HMAC_SHA1 int32 = 8 - DSAWITHSHA1_CMSOID int32 = 9 - MD5WITHRSAENCRYPTION_CMSOID int32 = 10 - SHA1WITHRSAENCRYPTION_CMSOID int32 = 11 - RC2CBC_ENVOID int32 = 12 - RSAENCRYPTION_ENVOID int32 = 13 - RSAES_OAEP_ENV_OID int32 = 14 - DES_EDE3_CBC_ENV_OID int32 = 15 - DES3_CBC_SHA1_KD int32 = 16 - AES128_CTS_HMAC_SHA1_96 int32 = 17 - AES256_CTS_HMAC_SHA1_96 int32 = 18 - AES128_CTS_HMAC_SHA256_128 int32 = 19 - AES256_CTS_HMAC_SHA384_192 int32 = 20 - //UNASSIGNED : 21-22 - RC4_HMAC int32 = 23 - RC4_HMAC_EXP int32 = 24 - CAMELLIA128_CTS_CMAC int32 = 25 - CAMELLIA256_CTS_CMAC int32 = 26 - //UNASSIGNED : 27-64 - SUBKEY_KEYMATERIAL int32 = 65 - //UNASSIGNED : 66-2147483647 -) - -// ETypesByName is a map of EncType names to their assigned EncType number. -var ETypesByName = map[string]int32{ - "des-cbc-crc": DES_CBC_CRC, - "des-cbc-md4": DES_CBC_MD4, - "des-cbc-md5": DES_CBC_MD5, - "des-cbc-raw": DES_CBC_RAW, - "des3-cbc-md5": DES3_CBC_MD5, - "des3-cbc-raw": DES3_CBC_RAW, - "des3-cbc-sha1": DES3_CBC_SHA1, - "des3-hmac-sha1": DES_HMAC_SHA1, - "des3-cbc-sha1-kd": DES3_CBC_SHA1_KD, - "des-hmac-sha1": DES_HMAC_SHA1, - "dsaWithSHA1-CmsOID": DSAWITHSHA1_CMSOID, - "md5WithRSAEncryption-CmsOID": MD5WITHRSAENCRYPTION_CMSOID, - "sha1WithRSAEncryption-CmsOID": SHA1WITHRSAENCRYPTION_CMSOID, - "rc2CBC-EnvOID": RC2CBC_ENVOID, - "rsaEncryption-EnvOID": RSAENCRYPTION_ENVOID, - "rsaES-OAEP-ENV-OID": RSAES_OAEP_ENV_OID, - "des-ede3-cbc-Env-OID": DES_EDE3_CBC_ENV_OID, - "aes128-cts-hmac-sha1-96": AES128_CTS_HMAC_SHA1_96, - "aes128-cts": AES128_CTS_HMAC_SHA1_96, - "aes128-sha1": AES128_CTS_HMAC_SHA1_96, - "aes256-cts-hmac-sha1-96": AES256_CTS_HMAC_SHA1_96, - "aes256-cts": AES256_CTS_HMAC_SHA1_96, - "aes256-sha1": AES256_CTS_HMAC_SHA1_96, - "aes128-cts-hmac-sha256-128": AES128_CTS_HMAC_SHA256_128, - "aes128-sha2": AES128_CTS_HMAC_SHA256_128, - "aes256-cts-hmac-sha384-192": AES256_CTS_HMAC_SHA384_192, - "aes256-sha2": AES256_CTS_HMAC_SHA384_192, - "arcfour-hmac": RC4_HMAC, - "rc4-hmac": RC4_HMAC, - "arcfour-hmac-md5": RC4_HMAC, - "arcfour-hmac-exp": RC4_HMAC_EXP, - "rc4-hmac-exp": RC4_HMAC_EXP, - "arcfour-hmac-md5-exp": RC4_HMAC_EXP, - "camellia128-cts-cmac": CAMELLIA128_CTS_CMAC, - "camellia128-cts": CAMELLIA128_CTS_CMAC, - "camellia256-cts-cmac": CAMELLIA256_CTS_CMAC, - "camellia256-cts": CAMELLIA256_CTS_CMAC, - "subkey-keymaterial": SUBKEY_KEYMATERIAL, -} - -// EtypeSupported resolves the etype name string to the etype ID. -// If zero is returned the etype is not supported by gokrb5. -func EtypeSupported(etype string) int32 { - // Slice of supported enctype IDs - s := []int32{ - AES128_CTS_HMAC_SHA1_96, - AES256_CTS_HMAC_SHA1_96, - AES128_CTS_HMAC_SHA256_128, - AES256_CTS_HMAC_SHA384_192, - DES3_CBC_SHA1_KD, - RC4_HMAC, - } - id := ETypesByName[etype] - if id == 0 { - return id - } - for _, sid := range s { - if id == sid { - return id - } - } - return 0 -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/flags/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/flags/constants.go deleted file mode 100644 index 787801f..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/flags/constants.go +++ /dev/null @@ -1,36 +0,0 @@ -// Package flags provides Kerberos 5 flag assigned numbers. -package flags - -// Flag values for KRB5 messages and tickets. -const ( - Reserved = 0 - Forwardable = 1 - Forwarded = 2 - Proxiable = 3 - Proxy = 4 - AllowPostDate = 5 - MayPostDate = 5 - PostDated = 6 - Invalid = 7 - Renewable = 8 - Initial = 9 - PreAuthent = 10 - HWAuthent = 11 - OptHardwareAuth = 11 - RequestAnonymous = 12 - TransitedPolicyChecked = 12 - OKAsDelegate = 13 - EncPARep = 15 - Canonicalize = 15 - DisableTransitedCheck = 26 - RenewableOK = 27 - EncTktInSkey = 28 - Renew = 30 - Validate = 31 - - // AP Option Flags - // 0 Reserved for future use. - APOptionUseSessionKey = 1 - APOptionMutualRequired = 2 - // 3-31 Reserved for future use. -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/keyusage/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/keyusage/constants.go deleted file mode 100644 index 5b232d1..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/keyusage/constants.go +++ /dev/null @@ -1,42 +0,0 @@ -// Package keyusage provides Kerberos 5 key usage assigned numbers. -package keyusage - -// Key usage numbers. -const ( - AS_REQ_PA_ENC_TIMESTAMP = 1 - KDC_REP_TICKET = 2 - AS_REP_ENCPART = 3 - TGS_REQ_KDC_REQ_BODY_AUTHDATA_SESSION_KEY = 4 - TGS_REQ_KDC_REQ_BODY_AUTHDATA_SUB_KEY = 5 - TGS_REQ_PA_TGS_REQ_AP_REQ_AUTHENTICATOR_CHKSUM = 6 - TGS_REQ_PA_TGS_REQ_AP_REQ_AUTHENTICATOR = 7 - TGS_REP_ENCPART_SESSION_KEY = 8 - TGS_REP_ENCPART_AUTHENTICATOR_SUB_KEY = 9 - AP_REQ_AUTHENTICATOR_CHKSUM = 10 - AP_REQ_AUTHENTICATOR = 11 - AP_REP_ENCPART = 12 - KRB_PRIV_ENCPART = 13 - KRB_CRED_ENCPART = 14 - KRB_SAFE_CHKSUM = 15 - KERB_NON_KERB_SALT = 16 - KERB_NON_KERB_CKSUM_SALT = 17 - //18. Reserved for future use in Kerberos and related protocols. - AD_KDC_ISSUED_CHKSUM = 19 - //20-21. Reserved for future use in Kerberos and related protocols. - GSSAPI_ACCEPTOR_SEAL = 22 - GSSAPI_ACCEPTOR_SIGN = 23 - GSSAPI_INITIATOR_SEAL = 24 - GSSAPI_INITIATOR_SIGN = 25 - KEY_USAGE_FAST_REQ_CHKSUM = 50 - KEY_USAGE_FAST_ENC = 51 - KEY_USAGE_FAST_REP = 52 - KEY_USAGE_FAST_FINISHED = 53 - KEY_USAGE_ENC_CHALLENGE_CLIENT = 54 - KEY_USAGE_ENC_CHALLENGE_KDC = 55 - KEY_USAGE_AS_REQ = 56 - //26-511. Reserved for future use in Kerberos and related protocols. - //512-1023. Reserved for uses internal to a Kerberos implementation. - //1024. Encryption for application use in protocols that do not specify key usage values - //1025. Checksums for application use in protocols that do not specify key usage values - //1026-2047. Reserved for application use. -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/msgtype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/msgtype/constants.go deleted file mode 100644 index ad21810..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/msgtype/constants.go +++ /dev/null @@ -1,18 +0,0 @@ -// Package msgtype provides Kerberos 5 message type assigned numbers. -package msgtype - -// KRB message type IDs. -const ( - KRB_AS_REQ = 10 //Request for initial authentication - KRB_AS_REP = 11 //Response to KRB_AS_REQ request - KRB_TGS_REQ = 12 //Request for authentication based on TGT - KRB_TGS_REP = 13 //Response to KRB_TGS_REQ request - KRB_AP_REQ = 14 //Application request to server - KRB_AP_REP = 15 //Response to KRB_AP_REQ_MUTUAL - KRB_RESERVED16 = 16 //Reserved for user-to-user krb_tgt_request - KRB_RESERVED17 = 17 //Reserved for user-to-user krb_tgt_reply - KRB_SAFE = 20 // Safe (checksummed) application message - KRB_PRIV = 21 // Private (encrypted) application message - KRB_CRED = 22 //Private (encrypted) message to forward credentials - KRB_ERROR = 30 //Error response -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/nametype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/nametype/constants.go deleted file mode 100644 index c111a05..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/nametype/constants.go +++ /dev/null @@ -1,15 +0,0 @@ -// Package nametype provides Kerberos 5 principal name type numbers. -package nametype - -// Kerberos name type IDs. -const ( - KRB_NT_UNKNOWN int32 = 0 //Name type not known - KRB_NT_PRINCIPAL int32 = 1 //Just the name of the principal as in DCE, or for users - KRB_NT_SRV_INST int32 = 2 //Service and other unique instance (krbtgt) - KRB_NT_SRV_HST int32 = 3 //Service with host name as instance (telnet, rcommands) - KRB_NT_SRV_XHST int32 = 4 //Service with host as remaining components - KRB_NT_UID int32 = 5 //Unique ID - KRB_NT_X500_PRINCIPAL int32 = 6 //Encoded X.509 Distinguished name [RFC2253] - KRB_NT_SMTP_NAME int32 = 7 //Name in form of SMTP email name (e.g., user@example.com) - KRB_NT_ENTERPRISE int32 = 10 //Enterprise name; may be mapped to principal name -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/iana/patype/constants.go b/vendor/github.com/jcmturner/gokrb5/v8/iana/patype/constants.go deleted file mode 100644 index aa04f63..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/iana/patype/constants.go +++ /dev/null @@ -1,77 +0,0 @@ -// Package patype provides Kerberos 5 pre-authentication type assigned numbers. -package patype - -// Kerberos pre-authentication type assigned numbers. -const ( - PA_TGS_REQ int32 = 1 - PA_ENC_TIMESTAMP int32 = 2 - PA_PW_SALT int32 = 3 - //RESERVED : 4 - PA_ENC_UNIX_TIME int32 = 5 - PA_SANDIA_SECUREID int32 = 6 - PA_SESAME int32 = 7 - PA_OSF_DCE int32 = 8 - PA_CYBERSAFE_SECUREID int32 = 9 - PA_AFS3_SALT int32 = 10 - PA_ETYPE_INFO int32 = 11 - PA_SAM_CHALLENGE int32 = 12 - PA_SAM_RESPONSE int32 = 13 - PA_PK_AS_REQ_OLD int32 = 14 - PA_PK_AS_REP_OLD int32 = 15 - PA_PK_AS_REQ int32 = 16 - PA_PK_AS_REP int32 = 17 - PA_PK_OCSP_RESPONSE int32 = 18 - PA_ETYPE_INFO2 int32 = 19 - PA_USE_SPECIFIED_KVNO int32 = 20 - PA_SVR_REFERRAL_INFO int32 = 20 - PA_SAM_REDIRECT int32 = 21 - PA_GET_FROM_TYPED_DATA int32 = 22 - TD_PADATA int32 = 22 - PA_SAM_ETYPE_INFO int32 = 23 - PA_ALT_PRINC int32 = 24 - PA_SERVER_REFERRAL int32 = 25 - //UNASSIGNED : 26-29 - PA_SAM_CHALLENGE2 int32 = 30 - PA_SAM_RESPONSE2 int32 = 31 - //UNASSIGNED : 32-40 - PA_EXTRA_TGT int32 = 41 - //UNASSIGNED : 42-100 - TD_PKINIT_CMS_CERTIFICATES int32 = 101 - TD_KRB_PRINCIPAL int32 = 102 - TD_KRB_REALM int32 = 103 - TD_TRUSTED_CERTIFIERS int32 = 104 - TD_CERTIFICATE_INDEX int32 = 105 - TD_APP_DEFINED_ERROR int32 = 106 - TD_REQ_NONCE int32 = 107 - TD_REQ_SEQ int32 = 108 - TD_DH_PARAMETERS int32 = 109 - //UNASSIGNED : 110 - TD_CMS_DIGEST_ALGORITHMS int32 = 111 - TD_CERT_DIGEST_ALGORITHMS int32 = 112 - //UNASSIGNED : 113-127 - PA_PAC_REQUEST int32 = 128 - PA_FOR_USER int32 = 129 - PA_FOR_X509_USER int32 = 130 - PA_FOR_CHECK_DUPS int32 = 131 - PA_AS_CHECKSUM int32 = 132 - PA_FX_COOKIE int32 = 133 - PA_AUTHENTICATION_SET int32 = 134 - PA_AUTH_SET_SELECTED int32 = 135 - PA_FX_FAST int32 = 136 - PA_FX_ERROR int32 = 137 - PA_ENCRYPTED_CHALLENGE int32 = 138 - //UNASSIGNED : 139-140 - PA_OTP_CHALLENGE int32 = 141 - PA_OTP_REQUEST int32 = 142 - PA_OTP_CONFIRM int32 = 143 - PA_OTP_PIN_CHANGE int32 = 144 - PA_EPAK_AS_REQ int32 = 145 - PA_EPAK_AS_REP int32 = 146 - PA_PKINIT_KX int32 = 147 - PA_PKU2U_NAME int32 = 148 - PA_REQ_ENC_PA_REP int32 = 149 - PA_AS_FRESHNESS int32 = 150 - //UNASSIGNED : 151-164 - PA_SUPPORTED_ETYPES int32 = 165 - PA_EXTENDED_ERROR int32 = 166 -) diff --git a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/changepasswddata.go b/vendor/github.com/jcmturner/gokrb5/v8/kadmin/changepasswddata.go deleted file mode 100644 index 2d68eda..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/changepasswddata.go +++ /dev/null @@ -1,23 +0,0 @@ -package kadmin - -import ( - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/types" -) - -// ChangePasswdData is the payload to a password change message. -type ChangePasswdData struct { - NewPasswd []byte `asn1:"explicit,tag:0"` - TargName types.PrincipalName `asn1:"explicit,optional,tag:1"` - TargRealm string `asn1:"generalstring,optional,explicit,tag:2"` -} - -// Marshal ChangePasswdData into a byte slice. -func (c *ChangePasswdData) Marshal() ([]byte, error) { - b, err := asn1.Marshal(*c) - if err != nil { - return []byte{}, err - } - //b = asn1tools.AddASNAppTag(b, asnAppTag.) - return b, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/message.go b/vendor/github.com/jcmturner/gokrb5/v8/kadmin/message.go deleted file mode 100644 index d1864c9..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/message.go +++ /dev/null @@ -1,114 +0,0 @@ -package kadmin - -import ( - "bytes" - "encoding/binary" - "errors" - "fmt" - "math" - - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -const ( - verisonHex = "ff80" -) - -// Request message for changing password. -type Request struct { - APREQ messages.APReq - KRBPriv messages.KRBPriv -} - -// Reply message for a password change. -type Reply struct { - MessageLength int - Version int - APREPLength int - APREP messages.APRep - KRBPriv messages.KRBPriv - KRBError messages.KRBError - IsKRBError bool - ResultCode uint16 - Result string -} - -// Marshal a Request into a byte slice. -func (m *Request) Marshal() (b []byte, err error) { - b = []byte{255, 128} // protocol version number: contains the hex constant 0xff80 (big-endian integer). - ab, e := m.APREQ.Marshal() - if e != nil { - err = fmt.Errorf("error marshaling AP_REQ: %v", e) - return - } - if len(ab) > math.MaxUint16 { - err = errors.New("length of AP_REQ greater then max Uint16 size") - return - } - al := make([]byte, 2) - binary.BigEndian.PutUint16(al, uint16(len(ab))) - b = append(b, al...) - b = append(b, ab...) - pb, e := m.KRBPriv.Marshal() - if e != nil { - err = fmt.Errorf("error marshaling KRB_Priv: %v", e) - return - } - b = append(b, pb...) - if len(b)+2 > math.MaxUint16 { - err = errors.New("length of message greater then max Uint16 size") - return - } - ml := make([]byte, 2) - binary.BigEndian.PutUint16(ml, uint16(len(b)+2)) - b = append(ml, b...) - return -} - -// Unmarshal a byte slice into a Reply. -func (m *Reply) Unmarshal(b []byte) error { - m.MessageLength = int(binary.BigEndian.Uint16(b[0:2])) - m.Version = int(binary.BigEndian.Uint16(b[2:4])) - if m.Version != 1 { - return fmt.Errorf("kadmin reply has incorrect protocol version number: %d", m.Version) - } - m.APREPLength = int(binary.BigEndian.Uint16(b[4:6])) - if m.APREPLength != 0 { - err := m.APREP.Unmarshal(b[6 : 6+m.APREPLength]) - if err != nil { - return err - } - err = m.KRBPriv.Unmarshal(b[6+m.APREPLength : m.MessageLength]) - if err != nil { - return err - } - } else { - m.IsKRBError = true - m.KRBError.Unmarshal(b[6:m.MessageLength]) - m.ResultCode, m.Result = parseResponse(m.KRBError.EData) - } - return nil -} - -func parseResponse(b []byte) (c uint16, s string) { - c = binary.BigEndian.Uint16(b[0:2]) - buf := bytes.NewBuffer(b[2:]) - m := make([]byte, len(b)-2) - binary.Read(buf, binary.BigEndian, &m) - s = string(m) - return -} - -// Decrypt the encrypted part of the KRBError within the change password Reply. -func (m *Reply) Decrypt(key types.EncryptionKey) error { - if m.IsKRBError { - return m.KRBError - } - err := m.KRBPriv.DecryptEncPart(key) - if err != nil { - return err - } - m.ResultCode, m.Result = parseResponse(m.KRBPriv.DecryptedEncPart.UserData) - return nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/passwd.go b/vendor/github.com/jcmturner/gokrb5/v8/kadmin/passwd.go deleted file mode 100644 index db199bf..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/kadmin/passwd.go +++ /dev/null @@ -1,68 +0,0 @@ -// Package kadmin provides Kerberos administration capabilities. -package kadmin - -import ( - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/types" -) - -// ChangePasswdMsg generate a change password request and also return the key needed to decrypt the reply. -func ChangePasswdMsg(cname types.PrincipalName, realm, password string, tkt messages.Ticket, sessionKey types.EncryptionKey) (r Request, k types.EncryptionKey, err error) { - // Create change password data struct and marshal to bytes - chgpasswd := ChangePasswdData{ - NewPasswd: []byte(password), - TargName: cname, - TargRealm: realm, - } - chpwdb, err := chgpasswd.Marshal() - if err != nil { - err = krberror.Errorf(err, krberror.KRBMsgError, "error marshaling change passwd data") - return - } - - // Generate authenticator - auth, err := types.NewAuthenticator(realm, cname) - if err != nil { - err = krberror.Errorf(err, krberror.KRBMsgError, "error generating new authenticator") - return - } - etype, err := crypto.GetEtype(sessionKey.KeyType) - if err != nil { - err = krberror.Errorf(err, krberror.KRBMsgError, "error generating subkey etype") - return - } - err = auth.GenerateSeqNumberAndSubKey(etype.GetETypeID(), etype.GetKeyByteSize()) - if err != nil { - err = krberror.Errorf(err, krberror.KRBMsgError, "error generating subkey") - return - } - k = auth.SubKey - - // Generate AP_REQ - APreq, err := messages.NewAPReq(tkt, sessionKey, auth) - if err != nil { - return - } - - // Form the KRBPriv encpart data - kp := messages.EncKrbPrivPart{ - UserData: chpwdb, - Timestamp: auth.CTime, - Usec: auth.Cusec, - SequenceNumber: auth.SeqNumber, - } - kpriv := messages.NewKRBPriv(kp) - err = kpriv.EncryptEncPart(k) - if err != nil { - err = krberror.Errorf(err, krberror.EncryptingError, "error encrypting change passwd data") - return - } - - r = Request{ - APREQ: APreq, - KRBPriv: kpriv, - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/keytab/keytab.go b/vendor/github.com/jcmturner/gokrb5/v8/keytab/keytab.go deleted file mode 100644 index dd75f7f..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/keytab/keytab.go +++ /dev/null @@ -1,470 +0,0 @@ -// Package keytab implements Kerberos keytabs: https://web.mit.edu/kerberos/krb5-devel/doc/formats/keytab_file_format.html. -package keytab - -import ( - "bytes" - "encoding/binary" - "encoding/json" - "errors" - "fmt" - "io" - "io/ioutil" - "time" - "unsafe" - - "github.com/jcmturner/gokrb5/v8/types" -) - -const ( - keytabFirstByte byte = 05 -) - -// Keytab struct. -type Keytab struct { - version uint8 - Entries []entry -} - -// Keytab entry struct. -type entry struct { - Principal principal - Timestamp time.Time - KVNO8 uint8 - Key types.EncryptionKey - KVNO uint32 -} - -// Keytab entry principal struct. -type principal struct { - NumComponents int16 `json:"-"` - Realm string - Components []string - NameType int32 -} - -// New creates new, empty Keytab type. -func New() *Keytab { - var e []entry - return &Keytab{ - version: 0, - Entries: e, - } -} - -// GetEncryptionKey returns the EncryptionKey from the Keytab for the newest entry with the required kvno, etype and matching principal. -// If the kvno is zero then the latest kvno will be returned. The kvno is also returned for -func (kt *Keytab) GetEncryptionKey(princName types.PrincipalName, realm string, kvno int, etype int32) (types.EncryptionKey, int, error) { - var key types.EncryptionKey - var t time.Time - for _, k := range kt.Entries { - if k.Principal.Realm == realm && len(k.Principal.Components) == len(princName.NameString) && - k.Key.KeyType == etype && - (k.KVNO == uint32(kvno) || kvno == 0) && - k.Timestamp.After(t) { - p := true - for i, n := range k.Principal.Components { - if princName.NameString[i] != n { - p = false - break - } - } - if p { - key = k.Key - kvno = int(k.KVNO) - t = k.Timestamp - } - } - } - if len(key.KeyValue) < 1 { - return key, 0, fmt.Errorf("matching key not found in keytab. Looking for %v realm: %v kvno: %v etype: %v", princName.NameString, realm, kvno, etype) - } - return key, kvno, nil -} - -// Create a new Keytab entry. -func newEntry() entry { - var b []byte - return entry{ - Principal: newPrincipal(), - Timestamp: time.Time{}, - KVNO8: 0, - Key: types.EncryptionKey{ - KeyType: 0, - KeyValue: b, - }, - KVNO: 0, - } -} - -// Create a new principal. -func newPrincipal() principal { - var c []string - return principal{ - NumComponents: 0, - Realm: "", - Components: c, - NameType: 0, - } -} - -// Load a Keytab file into a Keytab type. -func Load(ktPath string) (*Keytab, error) { - kt := new(Keytab) - b, err := ioutil.ReadFile(ktPath) - if err != nil { - return kt, err - } - err = kt.Unmarshal(b) - return kt, err -} - -// Marshal keytab into byte slice -func (kt *Keytab) Marshal() ([]byte, error) { - b := []byte{keytabFirstByte, kt.version} - for _, e := range kt.Entries { - eb, err := e.marshal(int(kt.version)) - if err != nil { - return b, err - } - b = append(b, eb...) - } - return b, nil -} - -// Write the keytab bytes to io.Writer. -// Returns the number of bytes written -func (kt *Keytab) Write(w io.Writer) (int, error) { - b, err := kt.Marshal() - if err != nil { - return 0, fmt.Errorf("error marshaling keytab: %v", err) - } - return w.Write(b) -} - -// Unmarshal byte slice of Keytab data into Keytab type. -func (kt *Keytab) Unmarshal(b []byte) error { - if len(b) < 2 { - return fmt.Errorf("byte array is less than 2 bytes: %d", len(b)) - } - - //The first byte of the file always has the value 5 - if b[0] != keytabFirstByte { - return errors.New("invalid keytab data. First byte does not equal 5") - } - //Get keytab version - //The 2nd byte contains the version number (1 or 2) - kt.version = b[1] - if kt.version != 1 && kt.version != 2 { - return errors.New("invalid keytab data. Keytab version is neither 1 nor 2") - } - //Version 1 of the file format uses native byte order for integer representations. Version 2 always uses big-endian byte order - var endian binary.ByteOrder - endian = binary.BigEndian - if kt.version == 1 && isNativeEndianLittle() { - endian = binary.LittleEndian - } - // n tracks position in the byte array - n := 2 - l, err := readInt32(b, &n, &endian) - if err != nil { - return err - } - for l != 0 { - if l < 0 { - //Zero padded so skip over - l = l * -1 - n = n + int(l) - } else { - if n < 0 { - return fmt.Errorf("%d can't be less than zero", n) - } - if n+int(l) > len(b) { - return fmt.Errorf("%s's length is less than %d", b, n+int(l)) - } - eb := b[n : n+int(l)] - n = n + int(l) - ke := newEntry() - // p keeps track as to where we are in the byte stream - var p int - var err error - parsePrincipal(eb, &p, kt, &ke, &endian) - ke.Timestamp, err = readTimestamp(eb, &p, &endian) - if err != nil { - return err - } - rei8, err := readInt8(eb, &p, &endian) - if err != nil { - return err - } - ke.KVNO8 = uint8(rei8) - rei16, err := readInt16(eb, &p, &endian) - if err != nil { - return err - } - ke.Key.KeyType = int32(rei16) - rei16, err = readInt16(eb, &p, &endian) - if err != nil { - return err - } - kl := int(rei16) - ke.Key.KeyValue, err = readBytes(eb, &p, kl, &endian) - if err != nil { - return err - } - // The 32-bit key version overrides the 8-bit key version. - // If at least 4 bytes are left after the other fields are read and they are non-zero - // this indicates the 32-bit version is present. - if len(eb)-p >= 4 { - // The 32-bit key may be present - ri32, err := readInt32(eb, &p, &endian) - if err != nil { - return err - } - ke.KVNO = uint32(ri32) - } - if ke.KVNO == 0 { - // Handles if the value from the last 4 bytes was zero and also if there are not the 4 bytes present. Makes sense to put the same value here as KVNO8 - ke.KVNO = uint32(ke.KVNO8) - } - // Add the entry to the keytab - kt.Entries = append(kt.Entries, ke) - } - // Check if there are still 4 bytes left to read - // Also check that n is greater than zero - if n < 0 || n > len(b) || len(b[n:]) < 4 { - break - } - // Read the size of the next entry - l, err = readInt32(b, &n, &endian) - if err != nil { - return err - } - } - return nil -} - -func (e entry) marshal(v int) ([]byte, error) { - var b []byte - pb, err := e.Principal.marshal(v) - if err != nil { - return b, err - } - b = append(b, pb...) - - var endian binary.ByteOrder - endian = binary.BigEndian - if v == 1 && isNativeEndianLittle() { - endian = binary.LittleEndian - } - - t := make([]byte, 9) - endian.PutUint32(t[0:4], uint32(e.Timestamp.Unix())) - t[4] = e.KVNO8 - endian.PutUint16(t[5:7], uint16(e.Key.KeyType)) - endian.PutUint16(t[7:9], uint16(len(e.Key.KeyValue))) - b = append(b, t...) - - buf := new(bytes.Buffer) - err = binary.Write(buf, endian, e.Key.KeyValue) - if err != nil { - return b, err - } - b = append(b, buf.Bytes()...) - - t = make([]byte, 4) - endian.PutUint32(t, e.KVNO) - b = append(b, t...) - - // Add the length header - t = make([]byte, 4) - endian.PutUint32(t, uint32(len(b))) - b = append(t, b...) - return b, nil -} - -// Parse the Keytab bytes of a principal into a Keytab entry's principal. -func parsePrincipal(b []byte, p *int, kt *Keytab, ke *entry, e *binary.ByteOrder) error { - var err error - ke.Principal.NumComponents, err = readInt16(b, p, e) - if err != nil { - return err - } - if kt.version == 1 { - //In version 1 the number of components includes the realm. Minus 1 to make consistent with version 2 - ke.Principal.NumComponents-- - } - lenRealm, err := readInt16(b, p, e) - if err != nil { - return err - } - realmB, err := readBytes(b, p, int(lenRealm), e) - if err != nil { - return err - } - ke.Principal.Realm = string(realmB) - for i := 0; i < int(ke.Principal.NumComponents); i++ { - l, err := readInt16(b, p, e) - if err != nil { - return err - } - compB, err := readBytes(b, p, int(l), e) - if err != nil { - return err - } - ke.Principal.Components = append(ke.Principal.Components, string(compB)) - } - if kt.version != 1 { - //Name Type is omitted in version 1 - ke.Principal.NameType, err = readInt32(b, p, e) - if err != nil { - return err - } - } - return nil -} - -func (p principal) marshal(v int) ([]byte, error) { - //var b []byte - b := make([]byte, 2) - var endian binary.ByteOrder - endian = binary.BigEndian - if v == 1 && isNativeEndianLittle() { - endian = binary.LittleEndian - } - endian.PutUint16(b[0:], uint16(p.NumComponents)) - realm, err := marshalString(p.Realm, v) - if err != nil { - return b, err - } - b = append(b, realm...) - for _, c := range p.Components { - cb, err := marshalString(c, v) - if err != nil { - return b, err - } - b = append(b, cb...) - } - if v != 1 { - t := make([]byte, 4) - endian.PutUint32(t, uint32(p.NameType)) - b = append(b, t...) - } - return b, nil -} - -func marshalString(s string, v int) ([]byte, error) { - sb := []byte(s) - b := make([]byte, 2) - var endian binary.ByteOrder - endian = binary.BigEndian - if v == 1 && isNativeEndianLittle() { - endian = binary.LittleEndian - } - endian.PutUint16(b[0:], uint16(len(sb))) - buf := new(bytes.Buffer) - err := binary.Write(buf, endian, sb) - if err != nil { - return b, err - } - b = append(b, buf.Bytes()...) - return b, err -} - -// Read bytes representing a timestamp. -func readTimestamp(b []byte, p *int, e *binary.ByteOrder) (time.Time, error) { - i32, err := readInt32(b, p, e) - if err != nil { - return time.Time{}, err - } - return time.Unix(int64(i32), 0), nil -} - -// Read bytes representing an eight bit integer. -func readInt8(b []byte, p *int, e *binary.ByteOrder) (i int8, err error) { - if *p < 0 { - return 0, fmt.Errorf("%d cannot be less than zero", *p) - } - - if (*p + 1) > len(b) { - return 0, fmt.Errorf("%s's length is less than %d", b, *p+1) - } - buf := bytes.NewBuffer(b[*p : *p+1]) - binary.Read(buf, *e, &i) - *p++ - return -} - -// Read bytes representing a sixteen bit integer. -func readInt16(b []byte, p *int, e *binary.ByteOrder) (i int16, err error) { - if *p < 0 { - return 0, fmt.Errorf("%d cannot be less than zero", *p) - } - - if (*p + 2) > len(b) { - return 0, fmt.Errorf("%s's length is less than %d", b, *p+2) - } - - buf := bytes.NewBuffer(b[*p : *p+2]) - binary.Read(buf, *e, &i) - *p += 2 - return -} - -// Read bytes representing a thirty two bit integer. -func readInt32(b []byte, p *int, e *binary.ByteOrder) (i int32, err error) { - if *p < 0 { - return 0, fmt.Errorf("%d cannot be less than zero", *p) - } - - if (*p + 4) > len(b) { - return 0, fmt.Errorf("%s's length is less than %d", b, *p+4) - } - - buf := bytes.NewBuffer(b[*p : *p+4]) - binary.Read(buf, *e, &i) - *p += 4 - return -} - -func readBytes(b []byte, p *int, s int, e *binary.ByteOrder) ([]byte, error) { - if s < 0 { - return nil, fmt.Errorf("%d cannot be less than zero", s) - } - i := *p + s - if i > len(b) { - return nil, fmt.Errorf("%s's length is greater than %d", b, i) - } - buf := bytes.NewBuffer(b[*p:i]) - r := make([]byte, s) - if err := binary.Read(buf, *e, &r); err != nil { - return nil, err - } - *p += s - return r, nil -} - -func isNativeEndianLittle() bool { - var x = 0x012345678 - var p = unsafe.Pointer(&x) - var bp = (*[4]byte)(p) - - var endian bool - if 0x01 == bp[0] { - endian = false - } else if (0x78 & 0xff) == (bp[0] & 0xff) { - endian = true - } else { - // Default to big endian - endian = false - } - return endian -} - -// JSON return information about the keys held in the keytab in a JSON format. -func (k *Keytab) JSON() (string, error) { - b, err := json.MarshalIndent(k, "", " ") - if err != nil { - return "", err - } - return string(b), nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/krberror/error.go b/vendor/github.com/jcmturner/gokrb5/v8/krberror/error.go deleted file mode 100644 index 01c6d99..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/krberror/error.go +++ /dev/null @@ -1,67 +0,0 @@ -// Package krberror provides error type and functions for gokrb5. -package krberror - -import ( - "fmt" - "strings" -) - -// Error type descriptions. -const ( - separator = " < " - EncodingError = "Encoding_Error" - NetworkingError = "Networking_Error" - DecryptingError = "Decrypting_Error" - EncryptingError = "Encrypting_Error" - ChksumError = "Checksum_Error" - KRBMsgError = "KRBMessage_Handling_Error" - ConfigError = "Configuration_Error" - KDCError = "KDC_Error" -) - -// Krberror is an error type for gokrb5 -type Krberror struct { - RootCause string - EText []string -} - -// Error function to implement the error interface. -func (e Krberror) Error() string { - return fmt.Sprintf("[Root cause: %s] ", e.RootCause) + strings.Join(e.EText, separator) -} - -// Add another error statement to the error. -func (e *Krberror) Add(et string, s string) { - e.EText = append([]string{fmt.Sprintf("%s: %s", et, s)}, e.EText...) -} - -// New creates a new instance of Krberror. -func New(et, s string) Krberror { - return Krberror{ - RootCause: et, - EText: []string{s}, - } -} - -// Errorf appends to or creates a new Krberror. -func Errorf(err error, et, format string, a ...interface{}) Krberror { - if e, ok := err.(Krberror); ok { - e.Add(et, fmt.Sprintf(format, a...)) - return e - } - return NewErrorf(et, format+": %s", append(a, err)...) -} - -// NewErrorf creates a new Krberror from a formatted string. -func NewErrorf(et, format string, a ...interface{}) Krberror { - var s string - if len(a) > 0 { - s = fmt.Sprintf("%s: %s", et, fmt.Sprintf(format, a...)) - } else { - s = fmt.Sprintf("%s: %s", et, format) - } - return Krberror{ - RootCause: et, - EText: []string{s}, - } -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/APRep.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/APRep.go deleted file mode 100644 index 555fb80..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/APRep.go +++ /dev/null @@ -1,49 +0,0 @@ -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -// APRep implements RFC 4120 KRB_AP_REP: https://tools.ietf.org/html/rfc4120#section-5.5.2. -type APRep struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - EncPart types.EncryptedData `asn1:"explicit,tag:2"` -} - -// EncAPRepPart is the encrypted part of KRB_AP_REP. -type EncAPRepPart struct { - CTime time.Time `asn1:"generalized,explicit,tag:0"` - Cusec int `asn1:"explicit,tag:1"` - Subkey types.EncryptionKey `asn1:"optional,explicit,tag:2"` - SequenceNumber int64 `asn1:"optional,explicit,tag:3"` -} - -// Unmarshal bytes b into the APRep struct. -func (a *APRep) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, a, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.APREP)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - expectedMsgType := msgtype.KRB_AP_REP - if a.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a KRB_AP_REP. Expected: %v; Actual: %v", expectedMsgType, a.MsgType) - } - return nil -} - -// Unmarshal bytes b into the APRep encrypted part struct. -func (a *EncAPRepPart) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, a, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.EncAPRepPart)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "AP_REP unmarshal error") - } - return nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/APReq.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/APReq.go deleted file mode 100644 index 1836079..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/APReq.go +++ /dev/null @@ -1,199 +0,0 @@ -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -type marshalAPReq struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - APOptions asn1.BitString `asn1:"explicit,tag:2"` - // Ticket needs to be a raw value as it is wrapped in an APPLICATION tag - Ticket asn1.RawValue `asn1:"explicit,tag:3"` - EncryptedAuthenticator types.EncryptedData `asn1:"explicit,tag:4"` -} - -// APReq implements RFC 4120 KRB_AP_REQ: https://tools.ietf.org/html/rfc4120#section-5.5.1. -type APReq struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - APOptions asn1.BitString `asn1:"explicit,tag:2"` - Ticket Ticket `asn1:"explicit,tag:3"` - EncryptedAuthenticator types.EncryptedData `asn1:"explicit,tag:4"` - Authenticator types.Authenticator `asn1:"optional"` -} - -// NewAPReq generates a new KRB_AP_REQ struct. -func NewAPReq(tkt Ticket, sessionKey types.EncryptionKey, auth types.Authenticator) (APReq, error) { - var a APReq - ed, err := encryptAuthenticator(auth, sessionKey, tkt) - if err != nil { - return a, krberror.Errorf(err, krberror.KRBMsgError, "error creating Authenticator for AP_REQ") - } - a = APReq{ - PVNO: iana.PVNO, - MsgType: msgtype.KRB_AP_REQ, - APOptions: types.NewKrbFlags(), - Ticket: tkt, - EncryptedAuthenticator: ed, - } - return a, nil -} - -// Encrypt Authenticator -func encryptAuthenticator(a types.Authenticator, sessionKey types.EncryptionKey, tkt Ticket) (types.EncryptedData, error) { - var ed types.EncryptedData - m, err := a.Marshal() - if err != nil { - return ed, krberror.Errorf(err, krberror.EncodingError, "marshaling error of EncryptedData form of Authenticator") - } - usage := authenticatorKeyUsage(tkt.SName) - ed, err = crypto.GetEncryptedData(m, sessionKey, uint32(usage), tkt.EncPart.KVNO) - if err != nil { - return ed, krberror.Errorf(err, krberror.EncryptingError, "error encrypting Authenticator") - } - return ed, nil -} - -// DecryptAuthenticator decrypts the Authenticator within the AP_REQ. -// sessionKey may simply be the key within the decrypted EncPart of the ticket within the AP_REQ. -func (a *APReq) DecryptAuthenticator(sessionKey types.EncryptionKey) error { - usage := authenticatorKeyUsage(a.Ticket.SName) - ab, e := crypto.DecryptEncPart(a.EncryptedAuthenticator, sessionKey, uint32(usage)) - if e != nil { - return fmt.Errorf("error decrypting authenticator: %v", e) - } - err := a.Authenticator.Unmarshal(ab) - if err != nil { - return fmt.Errorf("error unmarshaling authenticator: %v", err) - } - return nil -} - -func authenticatorKeyUsage(pn types.PrincipalName) int { - if pn.NameString[0] == "krbtgt" { - return keyusage.TGS_REQ_PA_TGS_REQ_AP_REQ_AUTHENTICATOR - } - return keyusage.AP_REQ_AUTHENTICATOR -} - -// Unmarshal bytes b into the APReq struct. -func (a *APReq) Unmarshal(b []byte) error { - var m marshalAPReq - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.APREQ)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "unmarshal error of AP_REQ") - } - if m.MsgType != msgtype.KRB_AP_REQ { - return NewKRBError(types.PrincipalName{}, "", errorcode.KRB_AP_ERR_MSG_TYPE, errorcode.Lookup(errorcode.KRB_AP_ERR_MSG_TYPE)) - } - a.PVNO = m.PVNO - a.MsgType = m.MsgType - a.APOptions = m.APOptions - a.EncryptedAuthenticator = m.EncryptedAuthenticator - a.Ticket, err = unmarshalTicket(m.Ticket.Bytes) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "unmarshaling error of Ticket within AP_REQ") - } - return nil -} - -// Marshal APReq struct. -func (a *APReq) Marshal() ([]byte, error) { - m := marshalAPReq{ - PVNO: a.PVNO, - MsgType: a.MsgType, - APOptions: a.APOptions, - EncryptedAuthenticator: a.EncryptedAuthenticator, - } - var b []byte - b, err := a.Ticket.Marshal() - if err != nil { - return b, err - } - m.Ticket = asn1.RawValue{ - Class: asn1.ClassContextSpecific, - IsCompound: true, - Tag: 3, - Bytes: b, - } - mk, err := asn1.Marshal(m) - if err != nil { - return mk, krberror.Errorf(err, krberror.EncodingError, "marshaling error of AP_REQ") - } - mk = asn1tools.AddASNAppTag(mk, asnAppTag.APREQ) - return mk, nil -} - -// Verify an AP_REQ using service's keytab, spn and max acceptable clock skew duration. -// The service ticket encrypted part and authenticator will be decrypted as part of this operation. -func (a *APReq) Verify(kt *keytab.Keytab, d time.Duration, cAddr types.HostAddress, snameOverride *types.PrincipalName) (bool, error) { - // Decrypt ticket's encrypted part with service key - //TODO decrypt with service's session key from its TGT is use-to-user. Need to figure out how to get TGT. - //if types.IsFlagSet(&a.APOptions, flags.APOptionUseSessionKey) { - // err := a.Ticket.Decrypt(tgt.DecryptedEncPart.Key) - // if err != nil { - // return false, krberror.Errorf(err, krberror.DecryptingError, "error decrypting encpart of ticket provided using session key") - // } - //} else { - // err := a.Ticket.DecryptEncPart(*kt, &a.Ticket.SName) - // if err != nil { - // return false, krberror.Errorf(err, krberror.DecryptingError, "error decrypting encpart of service ticket provided") - // } - //} - sname := &a.Ticket.SName - if snameOverride != nil { - sname = snameOverride - } - err := a.Ticket.DecryptEncPart(kt, sname) - if err != nil { - return false, krberror.Errorf(err, krberror.DecryptingError, "error decrypting encpart of service ticket provided") - } - - // Check time validity of ticket - ok, err := a.Ticket.Valid(d) - if err != nil || !ok { - return ok, err - } - - // Check client's address is listed in the client addresses in the ticket - if len(a.Ticket.DecryptedEncPart.CAddr) > 0 { - //If client addresses are present check if any of them match the source IP that sent the APReq - //If there is no match return KRB_AP_ERR_BADADDR error. - if !types.HostAddressesContains(a.Ticket.DecryptedEncPart.CAddr, cAddr) { - return false, NewKRBError(a.Ticket.SName, a.Ticket.Realm, errorcode.KRB_AP_ERR_BADADDR, "client address not within the list contained in the service ticket") - } - } - - // Decrypt authenticator with session key from ticket's encrypted part - err = a.DecryptAuthenticator(a.Ticket.DecryptedEncPart.Key) - if err != nil { - return false, NewKRBError(a.Ticket.SName, a.Ticket.Realm, errorcode.KRB_AP_ERR_BAD_INTEGRITY, "could not decrypt authenticator") - } - - // Check CName in authenticator is the same as that in the ticket - if !a.Authenticator.CName.Equal(a.Ticket.DecryptedEncPart.CName) { - return false, NewKRBError(a.Ticket.SName, a.Ticket.Realm, errorcode.KRB_AP_ERR_BADMATCH, "CName in Authenticator does not match that in service ticket") - } - - // Check the clock skew between the client and the service server - ct := a.Authenticator.CTime.Add(time.Duration(a.Authenticator.Cusec) * time.Microsecond) - t := time.Now().UTC() - if t.Sub(ct) > d || ct.Sub(t) > d { - return false, NewKRBError(a.Ticket.SName, a.Ticket.Realm, errorcode.KRB_AP_ERR_SKEW, fmt.Sprintf("clock skew with client too large. greater than %v seconds", d)) - } - return true, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCRep.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCRep.go deleted file mode 100644 index 41d2b2c..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCRep.go +++ /dev/null @@ -1,308 +0,0 @@ -package messages - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.4.2 - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/config" - "github.com/jcmturner/gokrb5/v8/credentials" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/flags" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/iana/patype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -type marshalKDCRep struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - PAData types.PADataSequence `asn1:"explicit,optional,tag:2"` - CRealm string `asn1:"generalstring,explicit,tag:3"` - CName types.PrincipalName `asn1:"explicit,tag:4"` - // Ticket needs to be a raw value as it is wrapped in an APPLICATION tag - Ticket asn1.RawValue `asn1:"explicit,tag:5"` - EncPart types.EncryptedData `asn1:"explicit,tag:6"` -} - -// KDCRepFields represents the KRB_KDC_REP fields. -type KDCRepFields struct { - PVNO int - MsgType int - PAData []types.PAData - CRealm string - CName types.PrincipalName - Ticket Ticket - EncPart types.EncryptedData - DecryptedEncPart EncKDCRepPart -} - -// ASRep implements RFC 4120 KRB_AS_REP: https://tools.ietf.org/html/rfc4120#section-5.4.2. -type ASRep struct { - KDCRepFields -} - -// TGSRep implements RFC 4120 KRB_TGS_REP: https://tools.ietf.org/html/rfc4120#section-5.4.2. -type TGSRep struct { - KDCRepFields -} - -// EncKDCRepPart is the encrypted part of KRB_KDC_REP. -type EncKDCRepPart struct { - Key types.EncryptionKey `asn1:"explicit,tag:0"` - LastReqs []LastReq `asn1:"explicit,tag:1"` - Nonce int `asn1:"explicit,tag:2"` - KeyExpiration time.Time `asn1:"generalized,explicit,optional,tag:3"` - Flags asn1.BitString `asn1:"explicit,tag:4"` - AuthTime time.Time `asn1:"generalized,explicit,tag:5"` - StartTime time.Time `asn1:"generalized,explicit,optional,tag:6"` - EndTime time.Time `asn1:"generalized,explicit,tag:7"` - RenewTill time.Time `asn1:"generalized,explicit,optional,tag:8"` - SRealm string `asn1:"generalstring,explicit,tag:9"` - SName types.PrincipalName `asn1:"explicit,tag:10"` - CAddr []types.HostAddress `asn1:"explicit,optional,tag:11"` - EncPAData types.PADataSequence `asn1:"explicit,optional,tag:12"` -} - -// LastReq part of KRB_KDC_REP. -type LastReq struct { - LRType int32 `asn1:"explicit,tag:0"` - LRValue time.Time `asn1:"generalized,explicit,tag:1"` -} - -// Unmarshal bytes b into the ASRep struct. -func (k *ASRep) Unmarshal(b []byte) error { - var m marshalKDCRep - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.ASREP)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - if m.MsgType != msgtype.KRB_AS_REP { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate an AS_REP. Expected: %v; Actual: %v", msgtype.KRB_AS_REP, m.MsgType) - } - //Process the raw ticket within - tkt, err := unmarshalTicket(m.Ticket.Bytes) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling Ticket within AS_REP") - } - k.KDCRepFields = KDCRepFields{ - PVNO: m.PVNO, - MsgType: m.MsgType, - PAData: m.PAData, - CRealm: m.CRealm, - CName: m.CName, - Ticket: tkt, - EncPart: m.EncPart, - } - return nil -} - -// Unmarshal bytes b into the TGSRep struct. -func (k *TGSRep) Unmarshal(b []byte) error { - var m marshalKDCRep - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.TGSREP)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - if m.MsgType != msgtype.KRB_TGS_REP { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate an TGS_REP. Expected: %v; Actual: %v", msgtype.KRB_TGS_REP, m.MsgType) - } - //Process the raw ticket within - tkt, err := unmarshalTicket(m.Ticket.Bytes) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling Ticket within TGS_REP") - } - k.KDCRepFields = KDCRepFields{ - PVNO: m.PVNO, - MsgType: m.MsgType, - PAData: m.PAData, - CRealm: m.CRealm, - CName: m.CName, - Ticket: tkt, - EncPart: m.EncPart, - } - return nil -} - -// Unmarshal bytes b into encrypted part of KRB_KDC_REP. -func (e *EncKDCRepPart) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, e, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.EncASRepPart)) - if err != nil { - // Try using tag 26 - // Ref: RFC 4120 - mentions that some implementations use application tag number 26 wether or not the reply is - // a AS-REP or a TGS-REP. - _, err = asn1.UnmarshalWithParams(b, e, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.EncTGSRepPart)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling encrypted part within KDC_REP") - } - } - return nil -} - -// DecryptEncPart decrypts the encrypted part of an AS_REP. -func (k *ASRep) DecryptEncPart(c *credentials.Credentials) (types.EncryptionKey, error) { - var key types.EncryptionKey - var err error - if c.HasKeytab() { - key, _, err = c.Keytab().GetEncryptionKey(k.CName, k.CRealm, k.EncPart.KVNO, k.EncPart.EType) - if err != nil { - return key, krberror.Errorf(err, krberror.DecryptingError, "error decrypting AS_REP encrypted part") - } - } - if c.HasPassword() { - key, _, err = crypto.GetKeyFromPassword(c.Password(), k.CName, k.CRealm, k.EncPart.EType, k.PAData) - if err != nil { - return key, krberror.Errorf(err, krberror.DecryptingError, "error decrypting AS_REP encrypted part") - } - } - if !c.HasKeytab() && !c.HasPassword() { - return key, krberror.NewErrorf(krberror.DecryptingError, "no secret available in credentials to perform decryption of AS_REP encrypted part") - } - b, err := crypto.DecryptEncPart(k.EncPart, key, keyusage.AS_REP_ENCPART) - if err != nil { - return key, krberror.Errorf(err, krberror.DecryptingError, "error decrypting AS_REP encrypted part") - } - var denc EncKDCRepPart - err = denc.Unmarshal(b) - if err != nil { - return key, krberror.Errorf(err, krberror.EncodingError, "error unmarshaling decrypted encpart of AS_REP") - } - k.DecryptedEncPart = denc - return key, nil -} - -// Verify checks the validity of AS_REP message. -func (k *ASRep) Verify(cfg *config.Config, creds *credentials.Credentials, asReq ASReq) (bool, error) { - //Ref RFC 4120 Section 3.1.5 - if k.CName.NameType != asReq.ReqBody.CName.NameType || k.CName.NameString == nil { - return false, krberror.NewErrorf(krberror.KRBMsgError, "CName in response does not match what was requested. Requested: %+v; Reply: %+v", asReq.ReqBody.CName, k.CName) - } - for i := range k.CName.NameString { - if k.CName.NameString[i] != asReq.ReqBody.CName.NameString[i] { - return false, krberror.NewErrorf(krberror.KRBMsgError, "CName in response does not match what was requested. Requested: %+v; Reply: %+v", asReq.ReqBody.CName, k.CName) - } - } - if k.CRealm != asReq.ReqBody.Realm { - return false, krberror.NewErrorf(krberror.KRBMsgError, "CRealm in response does not match what was requested. Requested: %s; Reply: %s", asReq.ReqBody.Realm, k.CRealm) - } - key, err := k.DecryptEncPart(creds) - if err != nil { - return false, krberror.Errorf(err, krberror.DecryptingError, "error decrypting EncPart of AS_REP") - } - if k.DecryptedEncPart.Nonce != asReq.ReqBody.Nonce { - return false, krberror.NewErrorf(krberror.KRBMsgError, "possible replay attack, nonce in response does not match that in request") - } - if k.DecryptedEncPart.SName.NameType != asReq.ReqBody.SName.NameType || k.DecryptedEncPart.SName.NameString == nil { - return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response does not match what was requested. Requested: %v; Reply: %v", asReq.ReqBody.SName, k.DecryptedEncPart.SName) - } - for i := range k.CName.NameString { - if k.DecryptedEncPart.SName.NameString[i] != asReq.ReqBody.SName.NameString[i] { - return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response does not match what was requested. Requested: %+v; Reply: %+v", asReq.ReqBody.SName, k.DecryptedEncPart.SName) - } - } - if k.DecryptedEncPart.SRealm != asReq.ReqBody.Realm { - return false, krberror.NewErrorf(krberror.KRBMsgError, "SRealm in response does not match what was requested. Requested: %s; Reply: %s", asReq.ReqBody.Realm, k.DecryptedEncPart.SRealm) - } - if len(asReq.ReqBody.Addresses) > 0 { - if !types.HostAddressesEqual(k.DecryptedEncPart.CAddr, asReq.ReqBody.Addresses) { - return false, krberror.NewErrorf(krberror.KRBMsgError, "addresses listed in the AS_REP does not match those listed in the AS_REQ") - } - } - t := time.Now().UTC() - if t.Sub(k.DecryptedEncPart.AuthTime) > cfg.LibDefaults.Clockskew || k.DecryptedEncPart.AuthTime.Sub(t) > cfg.LibDefaults.Clockskew { - return false, krberror.NewErrorf(krberror.KRBMsgError, "clock skew with KDC too large. Greater than %v seconds", cfg.LibDefaults.Clockskew.Seconds()) - } - // RFC 6806 https://tools.ietf.org/html/rfc6806.html#section-11 - if asReq.PAData.Contains(patype.PA_REQ_ENC_PA_REP) && types.IsFlagSet(&k.DecryptedEncPart.Flags, flags.EncPARep) { - if len(k.DecryptedEncPart.EncPAData) < 2 || !k.DecryptedEncPart.EncPAData.Contains(patype.PA_FX_FAST) { - return false, krberror.NewErrorf(krberror.KRBMsgError, "KDC did not respond appropriately to FAST negotiation") - } - for _, pa := range k.DecryptedEncPart.EncPAData { - if pa.PADataType == patype.PA_REQ_ENC_PA_REP { - var pafast types.PAReqEncPARep - err := pafast.Unmarshal(pa.PADataValue) - if err != nil { - return false, krberror.Errorf(err, krberror.EncodingError, "KDC FAST negotiation response error, could not unmarshal PA_REQ_ENC_PA_REP") - } - etype, err := crypto.GetChksumEtype(pafast.ChksumType) - if err != nil { - return false, krberror.Errorf(err, krberror.ChksumError, "KDC FAST negotiation response error") - } - ab, _ := asReq.Marshal() - if !etype.VerifyChecksum(key.KeyValue, ab, pafast.Chksum, keyusage.KEY_USAGE_AS_REQ) { - return false, krberror.Errorf(err, krberror.ChksumError, "KDC FAST negotiation response checksum invalid") - } - } - } - } - return true, nil -} - -// DecryptEncPart decrypts the encrypted part of an TGS_REP. -func (k *TGSRep) DecryptEncPart(key types.EncryptionKey) error { - b, err := crypto.DecryptEncPart(k.EncPart, key, keyusage.TGS_REP_ENCPART_SESSION_KEY) - if err != nil { - return krberror.Errorf(err, krberror.DecryptingError, "error decrypting TGS_REP EncPart") - } - var denc EncKDCRepPart - err = denc.Unmarshal(b) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling encrypted part") - } - k.DecryptedEncPart = denc - return nil -} - -// Verify checks the validity of the TGS_REP message. -func (k *TGSRep) Verify(cfg *config.Config, tgsReq TGSReq) (bool, error) { - if k.CName.NameType != tgsReq.ReqBody.CName.NameType || k.CName.NameString == nil { - return false, krberror.NewErrorf(krberror.KRBMsgError, "CName type in response does not match what was requested. Requested: %+v; Reply: %+v", tgsReq.ReqBody.CName, k.CName) - } - for i := range k.CName.NameString { - if k.CName.NameString[i] != tgsReq.ReqBody.CName.NameString[i] { - return false, krberror.NewErrorf(krberror.KRBMsgError, "CName in response does not match what was requested. Requested: %+v; Reply: %+v", tgsReq.ReqBody.CName, k.CName) - } - } - if k.Ticket.Realm != tgsReq.ReqBody.Realm { - return false, krberror.NewErrorf(krberror.KRBMsgError, "realm in response ticket does not match what was requested. Requested: %s; Reply: %s", tgsReq.ReqBody.Realm, k.Ticket.Realm) - } - if k.DecryptedEncPart.Nonce != tgsReq.ReqBody.Nonce { - return false, krberror.NewErrorf(krberror.KRBMsgError, "possible replay attack, nonce in response does not match that in request") - } - //if k.Ticket.SName.NameType != tgsReq.ReqBody.SName.NameType || k.Ticket.SName.NameString == nil { - // return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response ticket does not match what was requested. Requested: %v; Reply: %v", tgsReq.ReqBody.SName, k.Ticket.SName) - //} - //for i := range k.Ticket.SName.NameString { - // if k.Ticket.SName.NameString[i] != tgsReq.ReqBody.SName.NameString[i] { - // return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response ticket does not match what was requested. Requested: %+v; Reply: %+v", tgsReq.ReqBody.SName, k.Ticket.SName) - // } - //} - //if k.DecryptedEncPart.SName.NameType != tgsReq.ReqBody.SName.NameType || k.DecryptedEncPart.SName.NameString == nil { - // return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response does not match what was requested. Requested: %v; Reply: %v", tgsReq.ReqBody.SName, k.DecryptedEncPart.SName) - //} - //for i := range k.DecryptedEncPart.SName.NameString { - // if k.DecryptedEncPart.SName.NameString[i] != tgsReq.ReqBody.SName.NameString[i] { - // return false, krberror.NewErrorf(krberror.KRBMsgError, "SName in response does not match what was requested. Requested: %+v; Reply: %+v", tgsReq.ReqBody.SName, k.DecryptedEncPart.SName) - // } - //} - if k.DecryptedEncPart.SRealm != tgsReq.ReqBody.Realm { - return false, krberror.NewErrorf(krberror.KRBMsgError, "SRealm in response does not match what was requested. Requested: %s; Reply: %s", tgsReq.ReqBody.Realm, k.DecryptedEncPart.SRealm) - } - if len(k.DecryptedEncPart.CAddr) > 0 { - if !types.HostAddressesEqual(k.DecryptedEncPart.CAddr, tgsReq.ReqBody.Addresses) { - return false, krberror.NewErrorf(krberror.KRBMsgError, "addresses listed in the TGS_REP does not match those listed in the TGS_REQ") - } - } - if time.Since(k.DecryptedEncPart.StartTime) > cfg.LibDefaults.Clockskew || k.DecryptedEncPart.StartTime.Sub(time.Now().UTC()) > cfg.LibDefaults.Clockskew { - if time.Since(k.DecryptedEncPart.AuthTime) > cfg.LibDefaults.Clockskew || k.DecryptedEncPart.AuthTime.Sub(time.Now().UTC()) > cfg.LibDefaults.Clockskew { - return false, krberror.NewErrorf(krberror.KRBMsgError, "clock skew with KDC too large. Greater than %v seconds.", cfg.LibDefaults.Clockskew.Seconds()) - } - } - return true, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCReq.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCReq.go deleted file mode 100644 index 3745afe..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KDCReq.go +++ /dev/null @@ -1,432 +0,0 @@ -package messages - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.4.1 - -import ( - "crypto/rand" - "fmt" - "math" - "math/big" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/config" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/flags" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/iana/nametype" - "github.com/jcmturner/gokrb5/v8/iana/patype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -type marshalKDCReq struct { - PVNO int `asn1:"explicit,tag:1"` - MsgType int `asn1:"explicit,tag:2"` - PAData types.PADataSequence `asn1:"explicit,optional,tag:3"` - ReqBody asn1.RawValue `asn1:"explicit,tag:4"` -} - -// KDCReqFields represents the KRB_KDC_REQ fields. -type KDCReqFields struct { - PVNO int - MsgType int - PAData types.PADataSequence - ReqBody KDCReqBody - Renewal bool -} - -// ASReq implements RFC 4120 KRB_AS_REQ: https://tools.ietf.org/html/rfc4120#section-5.4.1. -type ASReq struct { - KDCReqFields -} - -// TGSReq implements RFC 4120 KRB_TGS_REQ: https://tools.ietf.org/html/rfc4120#section-5.4.1. -type TGSReq struct { - KDCReqFields -} - -type marshalKDCReqBody struct { - KDCOptions asn1.BitString `asn1:"explicit,tag:0"` - CName types.PrincipalName `asn1:"explicit,optional,tag:1"` - Realm string `asn1:"generalstring,explicit,tag:2"` - SName types.PrincipalName `asn1:"explicit,optional,tag:3"` - From time.Time `asn1:"generalized,explicit,optional,tag:4"` - Till time.Time `asn1:"generalized,explicit,tag:5"` - RTime time.Time `asn1:"generalized,explicit,optional,tag:6"` - Nonce int `asn1:"explicit,tag:7"` - EType []int32 `asn1:"explicit,tag:8"` - Addresses []types.HostAddress `asn1:"explicit,optional,tag:9"` - EncAuthData types.EncryptedData `asn1:"explicit,optional,tag:10"` - // Ticket needs to be a raw value as it is wrapped in an APPLICATION tag - AdditionalTickets asn1.RawValue `asn1:"explicit,optional,tag:11"` -} - -// KDCReqBody implements the KRB_KDC_REQ request body. -type KDCReqBody struct { - KDCOptions asn1.BitString `asn1:"explicit,tag:0"` - CName types.PrincipalName `asn1:"explicit,optional,tag:1"` - Realm string `asn1:"generalstring,explicit,tag:2"` - SName types.PrincipalName `asn1:"explicit,optional,tag:3"` - From time.Time `asn1:"generalized,explicit,optional,tag:4"` - Till time.Time `asn1:"generalized,explicit,tag:5"` - RTime time.Time `asn1:"generalized,explicit,optional,tag:6"` - Nonce int `asn1:"explicit,tag:7"` - EType []int32 `asn1:"explicit,tag:8"` - Addresses []types.HostAddress `asn1:"explicit,optional,tag:9"` - EncAuthData types.EncryptedData `asn1:"explicit,optional,tag:10"` - AdditionalTickets []Ticket `asn1:"explicit,optional,tag:11"` -} - -// NewASReqForTGT generates a new KRB_AS_REQ struct for a TGT request. -func NewASReqForTGT(realm string, c *config.Config, cname types.PrincipalName) (ASReq, error) { - sname := types.PrincipalName{ - NameType: nametype.KRB_NT_SRV_INST, - NameString: []string{"krbtgt", realm}, - } - return NewASReq(realm, c, cname, sname) -} - -// NewASReqForChgPasswd generates a new KRB_AS_REQ struct for a change password request. -func NewASReqForChgPasswd(realm string, c *config.Config, cname types.PrincipalName) (ASReq, error) { - sname := types.PrincipalName{ - NameType: nametype.KRB_NT_PRINCIPAL, - NameString: []string{"kadmin", "changepw"}, - } - return NewASReq(realm, c, cname, sname) -} - -// NewASReq generates a new KRB_AS_REQ struct for a given SNAME. -func NewASReq(realm string, c *config.Config, cname, sname types.PrincipalName) (ASReq, error) { - nonce, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt32)) - if err != nil { - return ASReq{}, err - } - t := time.Now().UTC() - // Copy the default options to make this thread safe - kopts := types.NewKrbFlags() - copy(kopts.Bytes, c.LibDefaults.KDCDefaultOptions.Bytes) - kopts.BitLength = c.LibDefaults.KDCDefaultOptions.BitLength - a := ASReq{ - KDCReqFields{ - PVNO: iana.PVNO, - MsgType: msgtype.KRB_AS_REQ, - PAData: types.PADataSequence{}, - ReqBody: KDCReqBody{ - KDCOptions: kopts, - Realm: realm, - CName: cname, - SName: sname, - Till: t.Add(c.LibDefaults.TicketLifetime), - Nonce: int(nonce.Int64()), - EType: c.LibDefaults.DefaultTktEnctypeIDs, - }, - }, - } - if c.LibDefaults.Forwardable { - types.SetFlag(&a.ReqBody.KDCOptions, flags.Forwardable) - } - if c.LibDefaults.Canonicalize { - types.SetFlag(&a.ReqBody.KDCOptions, flags.Canonicalize) - } - if c.LibDefaults.Proxiable { - types.SetFlag(&a.ReqBody.KDCOptions, flags.Proxiable) - } - if c.LibDefaults.RenewLifetime != 0 { - types.SetFlag(&a.ReqBody.KDCOptions, flags.Renewable) - a.ReqBody.RTime = t.Add(c.LibDefaults.RenewLifetime) - a.ReqBody.RTime = t.Add(time.Duration(48) * time.Hour) - } - if !c.LibDefaults.NoAddresses { - ha, err := types.LocalHostAddresses() - if err != nil { - return a, fmt.Errorf("could not get local addresses: %v", err) - } - ha = append(ha, types.HostAddressesFromNetIPs(c.LibDefaults.ExtraAddresses)...) - a.ReqBody.Addresses = ha - } - return a, nil -} - -// NewTGSReq generates a new KRB_TGS_REQ struct. -func NewTGSReq(cname types.PrincipalName, kdcRealm string, c *config.Config, tgt Ticket, sessionKey types.EncryptionKey, sname types.PrincipalName, renewal bool) (TGSReq, error) { - a, err := tgsReq(cname, sname, kdcRealm, renewal, c) - if err != nil { - return a, err - } - err = a.setPAData(tgt, sessionKey) - return a, err -} - -// NewUser2UserTGSReq returns a TGS-REQ suitable for user-to-user authentication (https://tools.ietf.org/html/rfc4120#section-3.7) -func NewUser2UserTGSReq(cname types.PrincipalName, kdcRealm string, c *config.Config, clientTGT Ticket, sessionKey types.EncryptionKey, sname types.PrincipalName, renewal bool, verifyingTGT Ticket) (TGSReq, error) { - a, err := tgsReq(cname, sname, kdcRealm, renewal, c) - if err != nil { - return a, err - } - a.ReqBody.AdditionalTickets = []Ticket{verifyingTGT} - types.SetFlag(&a.ReqBody.KDCOptions, flags.EncTktInSkey) - err = a.setPAData(clientTGT, sessionKey) - return a, err -} - -// tgsReq populates the fields for a TGS_REQ -func tgsReq(cname, sname types.PrincipalName, kdcRealm string, renewal bool, c *config.Config) (TGSReq, error) { - nonce, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt32)) - if err != nil { - return TGSReq{}, err - } - t := time.Now().UTC() - k := KDCReqFields{ - PVNO: iana.PVNO, - MsgType: msgtype.KRB_TGS_REQ, - ReqBody: KDCReqBody{ - KDCOptions: types.NewKrbFlags(), - Realm: kdcRealm, - CName: cname, // Add the CName to make validation of the reply easier - SName: sname, - Till: t.Add(c.LibDefaults.TicketLifetime), - Nonce: int(nonce.Int64()), - EType: c.LibDefaults.DefaultTGSEnctypeIDs, - }, - Renewal: renewal, - } - if c.LibDefaults.Forwardable { - types.SetFlag(&k.ReqBody.KDCOptions, flags.Forwardable) - } - if c.LibDefaults.Canonicalize { - types.SetFlag(&k.ReqBody.KDCOptions, flags.Canonicalize) - } - if c.LibDefaults.Proxiable { - types.SetFlag(&k.ReqBody.KDCOptions, flags.Proxiable) - } - if c.LibDefaults.RenewLifetime > time.Duration(0) { - types.SetFlag(&k.ReqBody.KDCOptions, flags.Renewable) - k.ReqBody.RTime = t.Add(c.LibDefaults.RenewLifetime) - } - if !c.LibDefaults.NoAddresses { - ha, err := types.LocalHostAddresses() - if err != nil { - return TGSReq{}, fmt.Errorf("could not get local addresses: %v", err) - } - ha = append(ha, types.HostAddressesFromNetIPs(c.LibDefaults.ExtraAddresses)...) - k.ReqBody.Addresses = ha - } - if renewal { - types.SetFlag(&k.ReqBody.KDCOptions, flags.Renew) - types.SetFlag(&k.ReqBody.KDCOptions, flags.Renewable) - } - return TGSReq{ - k, - }, nil -} - -func (k *TGSReq) setPAData(tgt Ticket, sessionKey types.EncryptionKey) error { - // Marshal the request and calculate checksum - b, err := k.ReqBody.Marshal() - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error marshaling TGS_REQ body") - } - etype, err := crypto.GetEtype(sessionKey.KeyType) - if err != nil { - return krberror.Errorf(err, krberror.EncryptingError, "error getting etype to encrypt authenticator") - } - cb, err := etype.GetChecksumHash(sessionKey.KeyValue, b, keyusage.TGS_REQ_PA_TGS_REQ_AP_REQ_AUTHENTICATOR_CHKSUM) - if err != nil { - return krberror.Errorf(err, krberror.ChksumError, "error getting etype checksum hash") - } - - // Form PAData for TGS_REQ - // Create authenticator - auth, err := types.NewAuthenticator(tgt.Realm, k.ReqBody.CName) - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "error generating new authenticator") - } - auth.Cksum = types.Checksum{ - CksumType: etype.GetHashID(), - Checksum: cb, - } - // Create AP_REQ - apReq, err := NewAPReq(tgt, sessionKey, auth) - if err != nil { - return krberror.Errorf(err, krberror.KRBMsgError, "error generating new AP_REQ") - } - apb, err := apReq.Marshal() - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error marshaling AP_REQ for pre-authentication data") - } - k.PAData = types.PADataSequence{ - types.PAData{ - PADataType: patype.PA_TGS_REQ, - PADataValue: apb, - }, - } - return nil -} - -// Unmarshal bytes b into the ASReq struct. -func (k *ASReq) Unmarshal(b []byte) error { - var m marshalKDCReq - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.ASREQ)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling AS_REQ") - } - expectedMsgType := msgtype.KRB_AS_REQ - if m.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a AS_REQ. Expected: %v; Actual: %v", expectedMsgType, m.MsgType) - } - var reqb KDCReqBody - err = reqb.Unmarshal(m.ReqBody.Bytes) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error processing AS_REQ body") - } - k.MsgType = m.MsgType - k.PAData = m.PAData - k.PVNO = m.PVNO - k.ReqBody = reqb - return nil -} - -// Unmarshal bytes b into the TGSReq struct. -func (k *TGSReq) Unmarshal(b []byte) error { - var m marshalKDCReq - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.TGSREQ)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling TGS_REQ") - } - expectedMsgType := msgtype.KRB_TGS_REQ - if m.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a TGS_REQ. Expected: %v; Actual: %v", expectedMsgType, m.MsgType) - } - var reqb KDCReqBody - err = reqb.Unmarshal(m.ReqBody.Bytes) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error processing TGS_REQ body") - } - k.MsgType = m.MsgType - k.PAData = m.PAData - k.PVNO = m.PVNO - k.ReqBody = reqb - return nil -} - -// Unmarshal bytes b into the KRB_KDC_REQ body struct. -func (k *KDCReqBody) Unmarshal(b []byte) error { - var m marshalKDCReqBody - _, err := asn1.Unmarshal(b, &m) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling KDC_REQ body") - } - k.KDCOptions = m.KDCOptions - if len(k.KDCOptions.Bytes) < 4 { - tb := make([]byte, 4-len(k.KDCOptions.Bytes)) - k.KDCOptions.Bytes = append(tb, k.KDCOptions.Bytes...) - k.KDCOptions.BitLength = len(k.KDCOptions.Bytes) * 8 - } - k.CName = m.CName - k.Realm = m.Realm - k.SName = m.SName - k.From = m.From - k.Till = m.Till - k.RTime = m.RTime - k.Nonce = m.Nonce - k.EType = m.EType - k.Addresses = m.Addresses - k.EncAuthData = m.EncAuthData - if len(m.AdditionalTickets.Bytes) > 0 { - k.AdditionalTickets, err = unmarshalTicketsSequence(m.AdditionalTickets) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling additional tickets") - } - } - return nil -} - -// Marshal ASReq struct. -func (k *ASReq) Marshal() ([]byte, error) { - m := marshalKDCReq{ - PVNO: k.PVNO, - MsgType: k.MsgType, - PAData: k.PAData, - } - b, err := k.ReqBody.Marshal() - if err != nil { - var mk []byte - return mk, err - } - m.ReqBody = asn1.RawValue{ - Class: asn1.ClassContextSpecific, - IsCompound: true, - Tag: 4, - Bytes: b, - } - mk, err := asn1.Marshal(m) - if err != nil { - return mk, krberror.Errorf(err, krberror.EncodingError, "error marshaling AS_REQ") - } - mk = asn1tools.AddASNAppTag(mk, asnAppTag.ASREQ) - return mk, nil -} - -// Marshal TGSReq struct. -func (k *TGSReq) Marshal() ([]byte, error) { - m := marshalKDCReq{ - PVNO: k.PVNO, - MsgType: k.MsgType, - PAData: k.PAData, - } - b, err := k.ReqBody.Marshal() - if err != nil { - var mk []byte - return mk, err - } - m.ReqBody = asn1.RawValue{ - Class: asn1.ClassContextSpecific, - IsCompound: true, - Tag: 4, - Bytes: b, - } - mk, err := asn1.Marshal(m) - if err != nil { - return mk, krberror.Errorf(err, krberror.EncodingError, "error marshaling AS_REQ") - } - mk = asn1tools.AddASNAppTag(mk, asnAppTag.TGSREQ) - return mk, nil -} - -// Marshal KRB_KDC_REQ body struct. -func (k *KDCReqBody) Marshal() ([]byte, error) { - var b []byte - m := marshalKDCReqBody{ - KDCOptions: k.KDCOptions, - CName: k.CName, - Realm: k.Realm, - SName: k.SName, - From: k.From, - Till: k.Till, - RTime: k.RTime, - Nonce: k.Nonce, - EType: k.EType, - Addresses: k.Addresses, - EncAuthData: k.EncAuthData, - } - rawtkts, err := MarshalTicketSequence(k.AdditionalTickets) - if err != nil { - return b, krberror.Errorf(err, krberror.EncodingError, "error in marshaling KDC request body additional tickets") - } - //The asn1.rawValue needs the tag setting on it for where it is in the KDCReqBody - rawtkts.Tag = 11 - if len(rawtkts.Bytes) > 0 { - m.AdditionalTickets = rawtkts - } - b, err = asn1.Marshal(m) - if err != nil { - return b, krberror.Errorf(err, krberror.EncodingError, "error in marshaling KDC request body") - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBCred.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBCred.go deleted file mode 100644 index 536fdb9..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBCred.go +++ /dev/null @@ -1,102 +0,0 @@ -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -type marshalKRBCred struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - Tickets asn1.RawValue `asn1:"explicit,tag:2"` - EncPart types.EncryptedData `asn1:"explicit,tag:3"` -} - -// KRBCred implements RFC 4120 KRB_CRED: https://tools.ietf.org/html/rfc4120#section-5.8.1. -type KRBCred struct { - PVNO int - MsgType int - Tickets []Ticket - EncPart types.EncryptedData - DecryptedEncPart EncKrbCredPart -} - -// EncKrbCredPart is the encrypted part of KRB_CRED. -type EncKrbCredPart struct { - TicketInfo []KrbCredInfo `asn1:"explicit,tag:0"` - Nouce int `asn1:"optional,explicit,tag:1"` - Timestamp time.Time `asn1:"generalized,optional,explicit,tag:2"` - Usec int `asn1:"optional,explicit,tag:3"` - SAddress types.HostAddress `asn1:"optional,explicit,tag:4"` - RAddress types.HostAddress `asn1:"optional,explicit,tag:5"` -} - -// KrbCredInfo is the KRB_CRED_INFO part of KRB_CRED. -type KrbCredInfo struct { - Key types.EncryptionKey `asn1:"explicit,tag:0"` - PRealm string `asn1:"generalstring,optional,explicit,tag:1"` - PName types.PrincipalName `asn1:"optional,explicit,tag:2"` - Flags asn1.BitString `asn1:"optional,explicit,tag:3"` - AuthTime time.Time `asn1:"generalized,optional,explicit,tag:4"` - StartTime time.Time `asn1:"generalized,optional,explicit,tag:5"` - EndTime time.Time `asn1:"generalized,optional,explicit,tag:6"` - RenewTill time.Time `asn1:"generalized,optional,explicit,tag:7"` - SRealm string `asn1:"optional,explicit,ia5,tag:8"` - SName types.PrincipalName `asn1:"optional,explicit,tag:9"` - CAddr types.HostAddresses `asn1:"optional,explicit,tag:10"` -} - -// Unmarshal bytes b into the KRBCred struct. -func (k *KRBCred) Unmarshal(b []byte) error { - var m marshalKRBCred - _, err := asn1.UnmarshalWithParams(b, &m, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.KRBCred)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - expectedMsgType := msgtype.KRB_CRED - if m.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a KRB_CRED. Expected: %v; Actual: %v", expectedMsgType, m.MsgType) - } - k.PVNO = m.PVNO - k.MsgType = m.MsgType - k.EncPart = m.EncPart - if len(m.Tickets.Bytes) > 0 { - k.Tickets, err = unmarshalTicketsSequence(m.Tickets) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling tickets within KRB_CRED") - } - } - return nil -} - -// DecryptEncPart decrypts the encrypted part of a KRB_CRED. -func (k *KRBCred) DecryptEncPart(key types.EncryptionKey) error { - b, err := crypto.DecryptEncPart(k.EncPart, key, keyusage.KRB_CRED_ENCPART) - if err != nil { - return krberror.Errorf(err, krberror.DecryptingError, "error decrypting KRB_CRED EncPart") - } - var denc EncKrbCredPart - err = denc.Unmarshal(b) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling encrypted part of KRB_CRED") - } - k.DecryptedEncPart = denc - return nil -} - -// Unmarshal bytes b into the encrypted part of KRB_CRED. -func (k *EncKrbCredPart) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, k, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.EncKrbCredPart)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "error unmarshaling EncKrbCredPart") - } - return nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBError.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBError.go deleted file mode 100644 index 4c88949..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBError.go +++ /dev/null @@ -1,83 +0,0 @@ -// Package messages implements Kerberos 5 message types and methods. -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -// KRBError implements RFC 4120 KRB_ERROR: https://tools.ietf.org/html/rfc4120#section-5.9.1. -type KRBError struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - CTime time.Time `asn1:"generalized,optional,explicit,tag:2"` - Cusec int `asn1:"optional,explicit,tag:3"` - STime time.Time `asn1:"generalized,explicit,tag:4"` - Susec int `asn1:"explicit,tag:5"` - ErrorCode int32 `asn1:"explicit,tag:6"` - CRealm string `asn1:"generalstring,optional,explicit,tag:7"` - CName types.PrincipalName `asn1:"optional,explicit,tag:8"` - Realm string `asn1:"generalstring,explicit,tag:9"` - SName types.PrincipalName `asn1:"explicit,tag:10"` - EText string `asn1:"generalstring,optional,explicit,tag:11"` - EData []byte `asn1:"optional,explicit,tag:12"` -} - -// NewKRBError creates a new KRBError. -func NewKRBError(sname types.PrincipalName, realm string, code int32, etext string) KRBError { - t := time.Now().UTC() - return KRBError{ - PVNO: iana.PVNO, - MsgType: msgtype.KRB_ERROR, - STime: t, - Susec: int((t.UnixNano() / int64(time.Microsecond)) - (t.Unix() * 1e6)), - ErrorCode: code, - SName: sname, - Realm: realm, - EText: etext, - } -} - -// Unmarshal bytes b into the KRBError struct. -func (k *KRBError) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, k, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.KRBError)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "KRB_ERROR unmarshal error") - } - expectedMsgType := msgtype.KRB_ERROR - if k.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a KRB_ERROR. Expected: %v; Actual: %v", expectedMsgType, k.MsgType) - } - return nil -} - -// Error method implementing error interface on KRBError struct. -func (k KRBError) Error() string { - etxt := fmt.Sprintf("KRB Error: %s", errorcode.Lookup(k.ErrorCode)) - if k.EText != "" { - etxt = fmt.Sprintf("%s - %s", etxt, k.EText) - } - return etxt -} - -func processUnmarshalReplyError(b []byte, err error) error { - switch err.(type) { - case asn1.StructuralError: - var krberr KRBError - tmperr := krberr.Unmarshal(b) - if tmperr != nil { - return krberror.Errorf(err, krberror.EncodingError, "failed to unmarshal KDC's reply") - } - return krberr - default: - return krberror.Errorf(err, krberror.EncodingError, "failed to unmarshal KDC's reply") - } -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBPriv.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBPriv.go deleted file mode 100644 index 0ca6149..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBPriv.go +++ /dev/null @@ -1,108 +0,0 @@ -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -// KRBPriv implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.7.1. -type KRBPriv struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - EncPart types.EncryptedData `asn1:"explicit,tag:3"` - DecryptedEncPart EncKrbPrivPart `asn1:"optional,omitempty"` // Not part of ASN1 bytes so marked as optional so unmarshalling works -} - -// EncKrbPrivPart is the encrypted part of KRB_PRIV. -type EncKrbPrivPart struct { - UserData []byte `asn1:"explicit,tag:0"` - Timestamp time.Time `asn1:"generalized,optional,explicit,tag:1"` - Usec int `asn1:"optional,explicit,tag:2"` - SequenceNumber int64 `asn1:"optional,explicit,tag:3"` - SAddress types.HostAddress `asn1:"explicit,tag:4"` - RAddress types.HostAddress `asn1:"optional,explicit,tag:5"` -} - -// NewKRBPriv returns a new KRBPriv type. -func NewKRBPriv(part EncKrbPrivPart) KRBPriv { - return KRBPriv{ - PVNO: iana.PVNO, - MsgType: msgtype.KRB_PRIV, - DecryptedEncPart: part, - } -} - -// Unmarshal bytes b into the KRBPriv struct. -func (k *KRBPriv) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, k, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.KRBPriv)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - expectedMsgType := msgtype.KRB_PRIV - if k.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a KRB_PRIV. Expected: %v; Actual: %v", expectedMsgType, k.MsgType) - } - return nil -} - -// Unmarshal bytes b into the EncKrbPrivPart struct. -func (k *EncKrbPrivPart) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, k, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.EncKrbPrivPart)) - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "KRB_PRIV unmarshal error") - } - return nil -} - -// Marshal the KRBPriv. -func (k *KRBPriv) Marshal() ([]byte, error) { - tk := KRBPriv{ - PVNO: k.PVNO, - MsgType: k.MsgType, - EncPart: k.EncPart, - } - b, err := asn1.Marshal(tk) - if err != nil { - return []byte{}, err - } - b = asn1tools.AddASNAppTag(b, asnAppTag.KRBPriv) - return b, nil -} - -// EncryptEncPart encrypts the DecryptedEncPart within the KRBPriv. -// Use to prepare for marshaling. -func (k *KRBPriv) EncryptEncPart(key types.EncryptionKey) error { - b, err := asn1.Marshal(k.DecryptedEncPart) - if err != nil { - return err - } - b = asn1tools.AddASNAppTag(b, asnAppTag.EncKrbPrivPart) - k.EncPart, err = crypto.GetEncryptedData(b, key, keyusage.KRB_PRIV_ENCPART, 1) - if err != nil { - return err - } - return nil -} - -// DecryptEncPart decrypts the encrypted part of the KRBPriv message. -func (k *KRBPriv) DecryptEncPart(key types.EncryptionKey) error { - b, err := crypto.DecryptEncPart(k.EncPart, key, keyusage.KRB_PRIV_ENCPART) - if err != nil { - return fmt.Errorf("error decrypting KRBPriv EncPart: %v", err) - } - err = k.DecryptedEncPart.Unmarshal(b) - if err != nil { - return fmt.Errorf("error unmarshaling encrypted part: %v", err) - } - return nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBSafe.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBSafe.go deleted file mode 100644 index 52cd284..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/KRBSafe.go +++ /dev/null @@ -1,43 +0,0 @@ -package messages - -import ( - "fmt" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/types" -) - -// KRBSafe implements RFC 4120 KRB_SAFE: https://tools.ietf.org/html/rfc4120#section-5.6.1. -type KRBSafe struct { - PVNO int `asn1:"explicit,tag:0"` - MsgType int `asn1:"explicit,tag:1"` - SafeBody KRBSafeBody `asn1:"explicit,tag:2"` - Cksum types.Checksum `asn1:"explicit,tag:3"` -} - -// KRBSafeBody implements the KRB_SAFE_BODY of KRB_SAFE. -type KRBSafeBody struct { - UserData []byte `asn1:"explicit,tag:0"` - Timestamp time.Time `asn1:"generalized,optional,explicit,tag:1"` - Usec int `asn1:"optional,explicit,tag:2"` - SequenceNumber int64 `asn1:"optional,explicit,tag:3"` - SAddress types.HostAddress `asn1:"explicit,tag:4"` - RAddress types.HostAddress `asn1:"optional,explicit,tag:5"` -} - -// Unmarshal bytes b into the KRBSafe struct. -func (s *KRBSafe) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, s, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.KRBSafe)) - if err != nil { - return processUnmarshalReplyError(b, err) - } - expectedMsgType := msgtype.KRB_SAFE - if s.MsgType != expectedMsgType { - return krberror.NewErrorf(krberror.KRBMsgError, "message ID does not indicate a KRB_SAFE. Expected: %v; Actual: %v", expectedMsgType, s.MsgType) - } - return nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/messages/Ticket.go b/vendor/github.com/jcmturner/gokrb5/v8/messages/Ticket.go deleted file mode 100644 index 58bc97e..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/messages/Ticket.go +++ /dev/null @@ -1,265 +0,0 @@ -package messages - -import ( - "crypto/rand" - "fmt" - "log" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/adtype" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" - "github.com/jcmturner/gokrb5/v8/iana/errorcode" - "github.com/jcmturner/gokrb5/v8/iana/flags" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/pac" - "github.com/jcmturner/gokrb5/v8/types" -) - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.3 - -// Ticket implements the Kerberos ticket. -type Ticket struct { - TktVNO int `asn1:"explicit,tag:0"` - Realm string `asn1:"generalstring,explicit,tag:1"` - SName types.PrincipalName `asn1:"explicit,tag:2"` - EncPart types.EncryptedData `asn1:"explicit,tag:3"` - DecryptedEncPart EncTicketPart `asn1:"optional"` // Not part of ASN1 bytes so marked as optional so unmarshalling works -} - -// EncTicketPart is the encrypted part of the Ticket. -type EncTicketPart struct { - Flags asn1.BitString `asn1:"explicit,tag:0"` - Key types.EncryptionKey `asn1:"explicit,tag:1"` - CRealm string `asn1:"generalstring,explicit,tag:2"` - CName types.PrincipalName `asn1:"explicit,tag:3"` - Transited TransitedEncoding `asn1:"explicit,tag:4"` - AuthTime time.Time `asn1:"generalized,explicit,tag:5"` - StartTime time.Time `asn1:"generalized,explicit,optional,tag:6"` - EndTime time.Time `asn1:"generalized,explicit,tag:7"` - RenewTill time.Time `asn1:"generalized,explicit,optional,tag:8"` - CAddr types.HostAddresses `asn1:"explicit,optional,tag:9"` - AuthorizationData types.AuthorizationData `asn1:"explicit,optional,tag:10"` -} - -// TransitedEncoding part of the ticket's encrypted part. -type TransitedEncoding struct { - TRType int32 `asn1:"explicit,tag:0"` - Contents []byte `asn1:"explicit,tag:1"` -} - -// NewTicket creates a new Ticket instance. -func NewTicket(cname types.PrincipalName, crealm string, sname types.PrincipalName, srealm string, flags asn1.BitString, sktab *keytab.Keytab, eTypeID int32, kvno int, authTime, startTime, endTime, renewTill time.Time) (Ticket, types.EncryptionKey, error) { - etype, err := crypto.GetEtype(eTypeID) - if err != nil { - return Ticket{}, types.EncryptionKey{}, krberror.Errorf(err, krberror.EncryptingError, "error getting etype for new ticket") - } - ks := etype.GetKeyByteSize() - kv := make([]byte, ks, ks) - rand.Read(kv) - sessionKey := types.EncryptionKey{ - KeyType: eTypeID, - KeyValue: kv, - } - etp := EncTicketPart{ - Flags: flags, - Key: sessionKey, - CRealm: crealm, - CName: cname, - Transited: TransitedEncoding{}, - AuthTime: authTime, - StartTime: startTime, - EndTime: endTime, - RenewTill: renewTill, - } - b, err := asn1.Marshal(etp) - if err != nil { - return Ticket{}, types.EncryptionKey{}, krberror.Errorf(err, krberror.EncodingError, "error marshalling ticket encpart") - } - b = asn1tools.AddASNAppTag(b, asnAppTag.EncTicketPart) - skey, _, err := sktab.GetEncryptionKey(sname, srealm, kvno, eTypeID) - if err != nil { - return Ticket{}, types.EncryptionKey{}, krberror.Errorf(err, krberror.EncryptingError, "error getting encryption key for new ticket") - } - ed, err := crypto.GetEncryptedData(b, skey, keyusage.KDC_REP_TICKET, kvno) - if err != nil { - return Ticket{}, types.EncryptionKey{}, krberror.Errorf(err, krberror.EncryptingError, "error encrypting ticket encpart") - } - tkt := Ticket{ - TktVNO: iana.PVNO, - Realm: srealm, - SName: sname, - EncPart: ed, - } - return tkt, sessionKey, nil -} - -// Unmarshal bytes b into a Ticket struct. -func (t *Ticket) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, t, fmt.Sprintf("application,explicit,tag:%d", asnAppTag.Ticket)) - return err -} - -// Marshal the Ticket. -func (t *Ticket) Marshal() ([]byte, error) { - b, err := asn1.Marshal(*t) - if err != nil { - return nil, err - } - b = asn1tools.AddASNAppTag(b, asnAppTag.Ticket) - return b, nil -} - -// Unmarshal bytes b into the EncTicketPart struct. -func (t *EncTicketPart) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, t, fmt.Sprintf("application,explicit,tag:%d", asnAppTag.EncTicketPart)) - return err -} - -// unmarshalTicket returns a ticket from the bytes provided. -func unmarshalTicket(b []byte) (t Ticket, err error) { - err = t.Unmarshal(b) - return -} - -// UnmarshalTicketsSequence returns a slice of Tickets from a raw ASN1 value. -func unmarshalTicketsSequence(in asn1.RawValue) ([]Ticket, error) { - //This is a workaround to a asn1 decoding issue in golang - https://github.com/golang/go/issues/17321. It's not pretty I'm afraid - //We pull out raw values from the larger raw value (that is actually the data of the sequence of raw values) and track our position moving along the data. - b := in.Bytes - // Ignore the head of the asn1 stream (1 byte for tag and those for the length) as this is what tells us its a sequence but we're handling it ourselves - p := 1 + asn1tools.GetNumberBytesInLengthHeader(in.Bytes) - var tkts []Ticket - var raw asn1.RawValue - for p < (len(b)) { - _, err := asn1.UnmarshalWithParams(b[p:], &raw, fmt.Sprintf("application,tag:%d", asnAppTag.Ticket)) - if err != nil { - return nil, fmt.Errorf("unmarshaling sequence of tickets failed getting length of ticket: %v", err) - } - t, err := unmarshalTicket(b[p:]) - if err != nil { - return nil, fmt.Errorf("unmarshaling sequence of tickets failed: %v", err) - } - p += len(raw.FullBytes) - tkts = append(tkts, t) - } - MarshalTicketSequence(tkts) - return tkts, nil -} - -// MarshalTicketSequence marshals a slice of Tickets returning an ASN1 raw value containing the ticket sequence. -func MarshalTicketSequence(tkts []Ticket) (asn1.RawValue, error) { - raw := asn1.RawValue{ - Class: 2, - IsCompound: true, - } - if len(tkts) < 1 { - // There are no tickets to marshal - return raw, nil - } - var btkts []byte - for i, t := range tkts { - b, err := t.Marshal() - if err != nil { - return raw, fmt.Errorf("error marshaling ticket number %d in sequence of tickets", i+1) - } - btkts = append(btkts, b...) - } - // The ASN1 wrapping consists of 2 bytes: - // 1st byte -> Identifier Octet - In this case an OCTET STRING (ASN TAG - // 2nd byte -> The length (this will be the size indicated in the input bytes + 2 for the additional bytes we add here. - // Application Tag: - //| Byte: | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | - //| Value: | 0 | 1 | 1 | From the RFC spec 4120 | - //| Explanation | Defined by the ASN1 encoding rules for an application tag | A value of 1 indicates a constructed type | The ASN Application tag value | - btkts = append(asn1tools.MarshalLengthBytes(len(btkts)), btkts...) - btkts = append([]byte{byte(32 + asn1.TagSequence)}, btkts...) - raw.Bytes = btkts - // If we need to create the full bytes then identifier octet is "context-specific" = 128 + "constructed" + 32 + the wrapping explicit tag (11) - //fmt.Fprintf(os.Stderr, "mRaw fb: %v\n", raw.FullBytes) - return raw, nil -} - -// DecryptEncPart decrypts the encrypted part of the ticket. -// The sname argument can be used to specify which service principal's key should be used to decrypt the ticket. -// If nil is passed as the sname then the service principal specified within the ticket it used. -func (t *Ticket) DecryptEncPart(keytab *keytab.Keytab, sname *types.PrincipalName) error { - if sname == nil { - sname = &t.SName - } - key, _, err := keytab.GetEncryptionKey(*sname, t.Realm, t.EncPart.KVNO, t.EncPart.EType) - if err != nil { - return NewKRBError(t.SName, t.Realm, errorcode.KRB_AP_ERR_NOKEY, fmt.Sprintf("Could not get key from keytab: %v", err)) - } - return t.Decrypt(key) -} - -// Decrypt decrypts the encrypted part of the ticket using the key provided. -func (t *Ticket) Decrypt(key types.EncryptionKey) error { - b, err := crypto.DecryptEncPart(t.EncPart, key, keyusage.KDC_REP_TICKET) - if err != nil { - return fmt.Errorf("error decrypting Ticket EncPart: %v", err) - } - var denc EncTicketPart - err = denc.Unmarshal(b) - if err != nil { - return fmt.Errorf("error unmarshaling encrypted part: %v", err) - } - t.DecryptedEncPart = denc - return nil -} - -// GetPACType returns a Microsoft PAC that has been extracted from the ticket and processed. -func (t *Ticket) GetPACType(keytab *keytab.Keytab, sname *types.PrincipalName, l *log.Logger) (bool, pac.PACType, error) { - var isPAC bool - for _, ad := range t.DecryptedEncPart.AuthorizationData { - if ad.ADType == adtype.ADIfRelevant { - var ad2 types.AuthorizationData - err := ad2.Unmarshal(ad.ADData) - if err != nil { - l.Printf("PAC authorization data could not be unmarshaled: %v", err) - continue - } - if ad2[0].ADType == adtype.ADWin2KPAC { - isPAC = true - var p pac.PACType - err = p.Unmarshal(ad2[0].ADData) - if err != nil { - return isPAC, p, fmt.Errorf("error unmarshaling PAC: %v", err) - } - if sname == nil { - sname = &t.SName - } - key, _, err := keytab.GetEncryptionKey(*sname, t.Realm, t.EncPart.KVNO, t.EncPart.EType) - if err != nil { - return isPAC, p, NewKRBError(t.SName, t.Realm, errorcode.KRB_AP_ERR_NOKEY, fmt.Sprintf("Could not get key from keytab: %v", err)) - } - err = p.ProcessPACInfoBuffers(key, l) - return isPAC, p, err - } - } - } - return isPAC, pac.PACType{}, nil -} - -// Valid checks it the ticket is currently valid. Max duration passed endtime passed in as argument. -func (t *Ticket) Valid(d time.Duration) (bool, error) { - // Check for future tickets or invalid tickets - time := time.Now().UTC() - if t.DecryptedEncPart.StartTime.Sub(time) > d || types.IsFlagSet(&t.DecryptedEncPart.Flags, flags.Invalid) { - return false, NewKRBError(t.SName, t.Realm, errorcode.KRB_AP_ERR_TKT_NYV, "service ticket provided is not yet valid") - } - - // Check for expired ticket - if time.Sub(t.DecryptedEncPart.EndTime) > d { - return false, NewKRBError(t.SName, t.Realm, errorcode.KRB_AP_ERR_TKT_EXPIRED, "service ticket provided has expired") - } - - return true, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/client_claims.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/client_claims.go deleted file mode 100644 index 08e63f4..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/client_claims.go +++ /dev/null @@ -1,33 +0,0 @@ -package pac - -import ( - "bytes" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// Claims reference: https://msdn.microsoft.com/en-us/library/hh553895.aspx - -// ClientClaimsInfo implements https://msdn.microsoft.com/en-us/library/hh536365.aspx -type ClientClaimsInfo struct { - ClaimsSetMetadata mstypes.ClaimsSetMetadata - ClaimsSet mstypes.ClaimsSet -} - -// Unmarshal bytes into the ClientClaimsInfo struct -func (k *ClientClaimsInfo) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - m := new(mstypes.ClaimsSetMetadata) - err = dec.Decode(m) - if err != nil { - err = fmt.Errorf("error unmarshaling ClientClaimsInfo ClaimsSetMetadata: %v", err) - } - k.ClaimsSetMetadata = *m - k.ClaimsSet, err = k.ClaimsSetMetadata.ClaimsSet() - if err != nil { - err = fmt.Errorf("error unmarshaling ClientClaimsInfo ClaimsSet: %v", err) - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/client_info.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/client_info.go deleted file mode 100644 index ddd9578..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/client_info.go +++ /dev/null @@ -1,31 +0,0 @@ -package pac - -import ( - "bytes" - - "github.com/jcmturner/rpc/v2/mstypes" -) - -// ClientInfo implements https://msdn.microsoft.com/en-us/library/cc237951.aspx -type ClientInfo struct { - ClientID mstypes.FileTime // A FILETIME structure in little-endian format that contains the Kerberos initial ticket-granting ticket TGT authentication time - NameLength uint16 // An unsigned 16-bit integer in little-endian format that specifies the length, in bytes, of the Name field. - Name string // An array of 16-bit Unicode characters in little-endian format that contains the client's account name. -} - -// Unmarshal bytes into the ClientInfo struct -func (k *ClientInfo) Unmarshal(b []byte) (err error) { - //The PAC_CLIENT_INFO structure is a simple structure that is not NDR-encoded. - r := mstypes.NewReader(bytes.NewReader(b)) - - k.ClientID, err = r.FileTime() - if err != nil { - return - } - k.NameLength, err = r.Uint16() - if err != nil { - return - } - k.Name, err = r.UTF16String(int(k.NameLength)) - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/credentials_info.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/credentials_info.go deleted file mode 100644 index 2266ce8..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/credentials_info.go +++ /dev/null @@ -1,82 +0,0 @@ -package pac - -import ( - "bytes" - "errors" - "fmt" - - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/types" - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// https://msdn.microsoft.com/en-us/library/cc237931.aspx - -// CredentialsInfo implements https://msdn.microsoft.com/en-us/library/cc237953.aspx -type CredentialsInfo struct { - Version uint32 // A 32-bit unsigned integer in little-endian format that defines the version. MUST be 0x00000000. - EType uint32 - PACCredentialDataEncrypted []byte // Key usage number for encryption: KERB_NON_KERB_SALT (16) - PACCredentialData CredentialData -} - -// Unmarshal bytes into the CredentialsInfo struct -func (c *CredentialsInfo) Unmarshal(b []byte, k types.EncryptionKey) (err error) { - //The CredentialsInfo structure is a simple structure that is not NDR-encoded. - r := mstypes.NewReader(bytes.NewReader(b)) - - c.Version, err = r.Uint32() - if err != nil { - return - } - if c.Version != 0 { - err = errors.New("credentials info version is not zero") - return - } - c.EType, err = r.Uint32() - if err != nil { - return - } - c.PACCredentialDataEncrypted, err = r.ReadBytes(len(b) - 8) - - err = c.DecryptEncPart(k) - if err != nil { - err = fmt.Errorf("error decrypting PAC Credentials Data: %v", err) - return - } - return -} - -// DecryptEncPart decrypts the encrypted part of the CredentialsInfo. -func (c *CredentialsInfo) DecryptEncPart(k types.EncryptionKey) error { - if k.KeyType != int32(c.EType) { - return fmt.Errorf("key provided is not the correct type. Type needed: %d, type provided: %d", c.EType, k.KeyType) - } - pt, err := crypto.DecryptMessage(c.PACCredentialDataEncrypted, k, keyusage.KERB_NON_KERB_SALT) - if err != nil { - return err - } - err = c.PACCredentialData.Unmarshal(pt) - if err != nil { - return err - } - return nil -} - -// CredentialData implements https://msdn.microsoft.com/en-us/library/cc237952.aspx -type CredentialData struct { - CredentialCount uint32 - Credentials []SECPKGSupplementalCred // Size is the value of CredentialCount -} - -// Unmarshal converts the bytes provided into a CredentialData type. -func (c *CredentialData) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - err = dec.Decode(c) - if err != nil { - err = fmt.Errorf("error unmarshaling KerbValidationInfo: %v", err) - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/device_claims.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/device_claims.go deleted file mode 100644 index 0892fad..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/device_claims.go +++ /dev/null @@ -1,33 +0,0 @@ -package pac - -import ( - "bytes" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// Claims reference: https://msdn.microsoft.com/en-us/library/hh553895.aspx - -// DeviceClaimsInfo implements https://msdn.microsoft.com/en-us/library/hh554226.aspx -type DeviceClaimsInfo struct { - ClaimsSetMetadata mstypes.ClaimsSetMetadata - ClaimsSet mstypes.ClaimsSet -} - -// Unmarshal bytes into the ClientClaimsInfo struct -func (k *DeviceClaimsInfo) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - m := new(mstypes.ClaimsSetMetadata) - err = dec.Decode(m) - if err != nil { - err = fmt.Errorf("error unmarshaling ClientClaimsInfo ClaimsSetMetadata: %v", err) - } - k.ClaimsSetMetadata = *m - k.ClaimsSet, err = k.ClaimsSetMetadata.ClaimsSet() - if err != nil { - err = fmt.Errorf("error unmarshaling ClientClaimsInfo ClaimsSet: %v", err) - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/device_info.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/device_info.go deleted file mode 100644 index ce82daa..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/device_info.go +++ /dev/null @@ -1,32 +0,0 @@ -package pac - -import ( - "bytes" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// DeviceInfo implements https://msdn.microsoft.com/en-us/library/hh536402.aspx -type DeviceInfo struct { - UserID uint32 // A 32-bit unsigned integer that contains the RID of the account. If the UserId member equals 0x00000000, the first group SID in this member is the SID for this account. - PrimaryGroupID uint32 // A 32-bit unsigned integer that contains the RID for the primary group to which this account belongs. - AccountDomainID mstypes.RPCSID `ndr:"pointer"` // A SID structure that contains the SID for the domain of the account.This member is used in conjunction with the UserId, and GroupIds members to create the user and group SIDs for the client. - AccountGroupCount uint32 // A 32-bit unsigned integer that contains the number of groups within the account domain to which the account belongs - AccountGroupIDs []mstypes.GroupMembership `ndr:"pointer,conformant"` // A pointer to a list of GROUP_MEMBERSHIP (section 2.2.2) structures that contains the groups to which the account belongs in the account domain. The number of groups in this list MUST be equal to GroupCount. - SIDCount uint32 // A 32-bit unsigned integer that contains the total number of SIDs present in the ExtraSids member. - ExtraSIDs []mstypes.KerbSidAndAttributes `ndr:"pointer,conformant"` // A pointer to a list of KERB_SID_AND_ATTRIBUTES structures that contain a list of SIDs corresponding to groups not in domains. If the UserId member equals 0x00000000, the first group SID in this member is the SID for this account. - DomainGroupCount uint32 // A 32-bit unsigned integer that contains the number of domains with groups to which the account belongs. - DomainGroup []mstypes.DomainGroupMembership `ndr:"pointer,conformant"` // A pointer to a list of DOMAIN_GROUP_MEMBERSHIP structures (section 2.2.3) that contains the domains to which the account belongs to a group. The number of sets in this list MUST be equal to DomainCount. -} - -// Unmarshal bytes into the DeviceInfo struct -func (k *DeviceInfo) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - err = dec.Decode(k) - if err != nil { - err = fmt.Errorf("error unmarshaling DeviceInfo: %v", err) - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/kerb_validation_info.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/kerb_validation_info.go deleted file mode 100644 index dde7861..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/kerb_validation_info.go +++ /dev/null @@ -1,110 +0,0 @@ -// Package pac implements Microsoft Privilege Attribute Certificate (PAC) processing. -package pac - -import ( - "bytes" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// KERB_VALIDATION_INFO flags. -const ( - USERFLAG_GUEST = 31 // Authentication was done via the GUEST account; no password was used. - USERFLAG_NO_ENCRYPTION_AVAILABLE = 30 // No encryption is available. - USERFLAG_LAN_MANAGER_KEY = 28 // LAN Manager key was used for authentication. - USERFLAG_SUB_AUTH = 25 // Sub-authentication used; session key came from the sub-authentication package. - USERFLAG_EXTRA_SIDS = 26 // Indicates that the ExtraSids field is populated and contains additional SIDs. - USERFLAG_MACHINE_ACCOUNT = 24 // Indicates that the account is a machine account. - USERFLAG_DC_NTLM2 = 23 // Indicates that the domain controller understands NTLMv2. - USERFLAG_RESOURCE_GROUPIDS = 22 // Indicates that the ResourceGroupIds field is populated. - USERFLAG_PROFILEPATH = 21 // Indicates that ProfilePath is populated. - USERFLAG_NTLM2_NTCHALLENGERESP = 20 // The NTLMv2 response from the NtChallengeResponseFields ([MS-NLMP] section 2.2.1.3) was used for authentication and session key generation. - USERFLAG_LM2_LMCHALLENGERESP = 19 // The LMv2 response from the LmChallengeResponseFields ([MS-NLMP] section 2.2.1.3) was used for authentication and session key generation. - USERFLAG_AUTH_LMCHALLENGERESP_KEY_NTCHALLENGERESP = 18 // The LMv2 response from the LmChallengeResponseFields ([MS-NLMP] section 2.2.1.3) was used for authentication and the NTLMv2 response from the NtChallengeResponseFields ([MS-NLMP] section 2.2.1.3) was used session key generation. -) - -// KerbValidationInfo implement https://msdn.microsoft.com/en-us/library/cc237948.aspx -type KerbValidationInfo struct { - LogOnTime mstypes.FileTime - LogOffTime mstypes.FileTime - KickOffTime mstypes.FileTime - PasswordLastSet mstypes.FileTime - PasswordCanChange mstypes.FileTime - PasswordMustChange mstypes.FileTime - EffectiveName mstypes.RPCUnicodeString - FullName mstypes.RPCUnicodeString - LogonScript mstypes.RPCUnicodeString - ProfilePath mstypes.RPCUnicodeString - HomeDirectory mstypes.RPCUnicodeString - HomeDirectoryDrive mstypes.RPCUnicodeString - LogonCount uint16 - BadPasswordCount uint16 - UserID uint32 - PrimaryGroupID uint32 - GroupCount uint32 - GroupIDs []mstypes.GroupMembership `ndr:"pointer,conformant"` - UserFlags uint32 - UserSessionKey mstypes.UserSessionKey - LogonServer mstypes.RPCUnicodeString - LogonDomainName mstypes.RPCUnicodeString - LogonDomainID mstypes.RPCSID `ndr:"pointer"` - Reserved1 [2]uint32 // Has 2 elements - UserAccountControl uint32 - SubAuthStatus uint32 - LastSuccessfulILogon mstypes.FileTime - LastFailedILogon mstypes.FileTime - FailedILogonCount uint32 - Reserved3 uint32 - SIDCount uint32 - ExtraSIDs []mstypes.KerbSidAndAttributes `ndr:"pointer,conformant"` - ResourceGroupDomainSID mstypes.RPCSID `ndr:"pointer"` - ResourceGroupCount uint32 - ResourceGroupIDs []mstypes.GroupMembership `ndr:"pointer,conformant"` -} - -// Unmarshal bytes into the DeviceInfo struct -func (k *KerbValidationInfo) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - err = dec.Decode(k) - if err != nil { - err = fmt.Errorf("error unmarshaling KerbValidationInfo: %v", err) - } - return -} - -// GetGroupMembershipSIDs returns a slice of strings containing the group membership SIDs found in the PAC. -func (k *KerbValidationInfo) GetGroupMembershipSIDs() []string { - var g []string - lSID := k.LogonDomainID.String() - for i := range k.GroupIDs { - g = append(g, fmt.Sprintf("%s-%d", lSID, k.GroupIDs[i].RelativeID)) - } - for _, s := range k.ExtraSIDs { - var exists = false - for _, es := range g { - if es == s.SID.String() { - exists = true - break - } - } - if !exists { - g = append(g, s.SID.String()) - } - } - for _, r := range k.ResourceGroupIDs { - var exists = false - s := fmt.Sprintf("%s-%d", k.ResourceGroupDomainSID.String(), r.RelativeID) - for _, es := range g { - if es == s { - exists = true - break - } - } - if !exists { - g = append(g, s) - } - } - return g -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/pac_type.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/pac_type.go deleted file mode 100644 index fab2ad7..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/pac_type.go +++ /dev/null @@ -1,251 +0,0 @@ -package pac - -import ( - "bytes" - "errors" - "fmt" - "log" - - "github.com/jcmturner/gokrb5/v8/crypto" - "github.com/jcmturner/gokrb5/v8/iana/keyusage" - "github.com/jcmturner/gokrb5/v8/types" - "github.com/jcmturner/rpc/v2/mstypes" -) - -const ( - infoTypeKerbValidationInfo uint32 = 1 - infoTypeCredentials uint32 = 2 - infoTypePACServerSignatureData uint32 = 6 - infoTypePACKDCSignatureData uint32 = 7 - infoTypePACClientInfo uint32 = 10 - infoTypeS4UDelegationInfo uint32 = 11 - infoTypeUPNDNSInfo uint32 = 12 - infoTypePACClientClaimsInfo uint32 = 13 - infoTypePACDeviceInfo uint32 = 14 - infoTypePACDeviceClaimsInfo uint32 = 15 -) - -// PACType implements: https://msdn.microsoft.com/en-us/library/cc237950.aspx -type PACType struct { - CBuffers uint32 - Version uint32 - Buffers []InfoBuffer - Data []byte - KerbValidationInfo *KerbValidationInfo - CredentialsInfo *CredentialsInfo - ServerChecksum *SignatureData - KDCChecksum *SignatureData - ClientInfo *ClientInfo - S4UDelegationInfo *S4UDelegationInfo - UPNDNSInfo *UPNDNSInfo - ClientClaimsInfo *ClientClaimsInfo - DeviceInfo *DeviceInfo - DeviceClaimsInfo *DeviceClaimsInfo - ZeroSigData []byte -} - -// InfoBuffer implements the PAC Info Buffer: https://msdn.microsoft.com/en-us/library/cc237954.aspx -type InfoBuffer struct { - ULType uint32 // A 32-bit unsigned integer in little-endian format that describes the type of data present in the buffer contained at Offset. - CBBufferSize uint32 // A 32-bit unsigned integer in little-endian format that contains the size, in bytes, of the buffer in the PAC located at Offset. - Offset uint64 // A 64-bit unsigned integer in little-endian format that contains the offset to the beginning of the buffer, in bytes, from the beginning of the PACTYPE structure. The data offset MUST be a multiple of eight. The following sections specify the format of each type of element. -} - -// Unmarshal bytes into the PACType struct -func (pac *PACType) Unmarshal(b []byte) (err error) { - pac.Data = b - zb := make([]byte, len(b), len(b)) - copy(zb, b) - pac.ZeroSigData = zb - r := mstypes.NewReader(bytes.NewReader(b)) - pac.CBuffers, err = r.Uint32() - if err != nil { - return - } - pac.Version, err = r.Uint32() - if err != nil { - return - } - buf := make([]InfoBuffer, pac.CBuffers, pac.CBuffers) - for i := range buf { - buf[i].ULType, err = r.Uint32() - if err != nil { - return - } - buf[i].CBBufferSize, err = r.Uint32() - if err != nil { - return - } - buf[i].Offset, err = r.Uint64() - if err != nil { - return - } - } - pac.Buffers = buf - return nil -} - -// ProcessPACInfoBuffers processes the PAC Info Buffers. -// https://msdn.microsoft.com/en-us/library/cc237954.aspx -func (pac *PACType) ProcessPACInfoBuffers(key types.EncryptionKey, l *log.Logger) error { - for _, buf := range pac.Buffers { - p := make([]byte, buf.CBBufferSize, buf.CBBufferSize) - copy(p, pac.Data[int(buf.Offset):int(buf.Offset)+int(buf.CBBufferSize)]) - switch buf.ULType { - case infoTypeKerbValidationInfo: - if pac.KerbValidationInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k KerbValidationInfo - err := k.Unmarshal(p) - if err != nil { - return fmt.Errorf("error processing KerbValidationInfo: %v", err) - } - pac.KerbValidationInfo = &k - case infoTypeCredentials: - // Currently PAC parsing is only useful on the service side in gokrb5 - // The CredentialsInfo are only useful when gokrb5 has implemented RFC4556 and only applied on the client side. - // Skipping CredentialsInfo - will be revisited under RFC4556 implementation. - continue - //if pac.CredentialsInfo != nil { - // //Must ignore subsequent buffers of this type - // continue - //} - //var k CredentialsInfo - //err := k.Unmarshal(p, key) // The encryption key used is the AS reply key only available to the client. - //if err != nil { - // return fmt.Errorf("error processing CredentialsInfo: %v", err) - //} - //pac.CredentialsInfo = &k - case infoTypePACServerSignatureData: - if pac.ServerChecksum != nil { - //Must ignore subsequent buffers of this type - continue - } - var k SignatureData - zb, err := k.Unmarshal(p) - copy(pac.ZeroSigData[int(buf.Offset):int(buf.Offset)+int(buf.CBBufferSize)], zb) - if err != nil { - return fmt.Errorf("error processing ServerChecksum: %v", err) - } - pac.ServerChecksum = &k - case infoTypePACKDCSignatureData: - if pac.KDCChecksum != nil { - //Must ignore subsequent buffers of this type - continue - } - var k SignatureData - zb, err := k.Unmarshal(p) - copy(pac.ZeroSigData[int(buf.Offset):int(buf.Offset)+int(buf.CBBufferSize)], zb) - if err != nil { - return fmt.Errorf("error processing KDCChecksum: %v", err) - } - pac.KDCChecksum = &k - case infoTypePACClientInfo: - if pac.ClientInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k ClientInfo - err := k.Unmarshal(p) - if err != nil { - return fmt.Errorf("error processing ClientInfo: %v", err) - } - pac.ClientInfo = &k - case infoTypeS4UDelegationInfo: - if pac.S4UDelegationInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k S4UDelegationInfo - err := k.Unmarshal(p) - if err != nil { - l.Printf("could not process S4U_DelegationInfo: %v", err) - continue - } - pac.S4UDelegationInfo = &k - case infoTypeUPNDNSInfo: - if pac.UPNDNSInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k UPNDNSInfo - err := k.Unmarshal(p) - if err != nil { - l.Printf("could not process UPN_DNSInfo: %v", err) - continue - } - pac.UPNDNSInfo = &k - case infoTypePACClientClaimsInfo: - if pac.ClientClaimsInfo != nil || len(p) < 1 { - //Must ignore subsequent buffers of this type - continue - } - var k ClientClaimsInfo - err := k.Unmarshal(p) - if err != nil { - l.Printf("could not process ClientClaimsInfo: %v", err) - continue - } - pac.ClientClaimsInfo = &k - case infoTypePACDeviceInfo: - if pac.DeviceInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k DeviceInfo - err := k.Unmarshal(p) - if err != nil { - l.Printf("could not process DeviceInfo: %v", err) - continue - } - pac.DeviceInfo = &k - case infoTypePACDeviceClaimsInfo: - if pac.DeviceClaimsInfo != nil { - //Must ignore subsequent buffers of this type - continue - } - var k DeviceClaimsInfo - err := k.Unmarshal(p) - if err != nil { - l.Printf("could not process DeviceClaimsInfo: %v", err) - continue - } - pac.DeviceClaimsInfo = &k - } - } - - if ok, err := pac.verify(key); !ok { - return err - } - - return nil -} - -func (pac *PACType) verify(key types.EncryptionKey) (bool, error) { - if pac.KerbValidationInfo == nil { - return false, errors.New("PAC Info Buffers does not contain a KerbValidationInfo") - } - if pac.ServerChecksum == nil { - return false, errors.New("PAC Info Buffers does not contain a ServerChecksum") - } - if pac.KDCChecksum == nil { - return false, errors.New("PAC Info Buffers does not contain a KDCChecksum") - } - if pac.ClientInfo == nil { - return false, errors.New("PAC Info Buffers does not contain a ClientInfo") - } - etype, err := crypto.GetChksumEtype(int32(pac.ServerChecksum.SignatureType)) - if err != nil { - return false, err - } - if ok := etype.VerifyChecksum(key.KeyValue, - pac.ZeroSigData, - pac.ServerChecksum.Signature, - keyusage.KERB_NON_KERB_CKSUM_SALT); !ok { - return false, errors.New("PAC service checksum verification failed") - } - - return true, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/s4u_delegation_info.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/s4u_delegation_info.go deleted file mode 100644 index da837d4..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/s4u_delegation_info.go +++ /dev/null @@ -1,26 +0,0 @@ -package pac - -import ( - "bytes" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -// S4UDelegationInfo implements https://msdn.microsoft.com/en-us/library/cc237944.aspx -type S4UDelegationInfo struct { - S4U2proxyTarget mstypes.RPCUnicodeString // The name of the principal to whom the application can forward the ticket. - TransitedListSize uint32 - S4UTransitedServices []mstypes.RPCUnicodeString `ndr:"pointer,conformant"` // List of all services that have been delegated through by this client and subsequent services or servers.. Size is value of TransitedListSize -} - -// Unmarshal bytes into the S4UDelegationInfo struct -func (k *S4UDelegationInfo) Unmarshal(b []byte) (err error) { - dec := ndr.NewDecoder(bytes.NewReader(b)) - err = dec.Decode(k) - if err != nil { - err = fmt.Errorf("error unmarshaling S4UDelegationInfo: %v", err) - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/signature_data.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/signature_data.go deleted file mode 100644 index 8f6aa58..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/signature_data.go +++ /dev/null @@ -1,67 +0,0 @@ -package pac - -import ( - "bytes" - - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/rpc/v2/mstypes" -) - -/* -https://msdn.microsoft.com/en-us/library/cc237955.aspx - -The Key Usage Value MUST be KERB_NON_KERB_CKSUM_SALT (17) [MS-KILE] (section 3.1.5.9). - -Server Signature (SignatureType = 0x00000006) -https://msdn.microsoft.com/en-us/library/cc237957.aspx - -KDC Signature (SignatureType = 0x00000007) -https://msdn.microsoft.com/en-us/library/dd357117.aspx -*/ - -// SignatureData implements https://msdn.microsoft.com/en-us/library/cc237955.aspx -type SignatureData struct { - SignatureType uint32 // A 32-bit unsigned integer value in little-endian format that defines the cryptographic system used to calculate the checksum. This MUST be one of the following checksum types: KERB_CHECKSUM_HMAC_MD5 (signature size = 16), HMAC_SHA1_96_AES128 (signature size = 12), HMAC_SHA1_96_AES256 (signature size = 12). - Signature []byte // Size depends on the type. See comment above. - RODCIdentifier uint16 // A 16-bit unsigned integer value in little-endian format that contains the first 16 bits of the key version number ([MS-KILE] section 3.1.5.8) when the KDC is an RODC. When the KDC is not an RODC, this field does not exist. -} - -// Unmarshal bytes into the SignatureData struct -func (k *SignatureData) Unmarshal(b []byte) (rb []byte, err error) { - r := mstypes.NewReader(bytes.NewReader(b)) - - k.SignatureType, err = r.Uint32() - if err != nil { - return - } - - var c int - switch k.SignatureType { - case chksumtype.KERB_CHECKSUM_HMAC_MD5_UNSIGNED: - c = 16 - case uint32(chksumtype.HMAC_SHA1_96_AES128): - c = 12 - case uint32(chksumtype.HMAC_SHA1_96_AES256): - c = 12 - } - k.Signature, err = r.ReadBytes(c) - if err != nil { - return - } - - // When the KDC is not an Read Only Domain Controller (RODC), this field does not exist. - if len(b) >= 4+c+2 { - k.RODCIdentifier, err = r.Uint16() - if err != nil { - return - } - } - - // Create bytes with zeroed signature needed for checksum verification - rb = make([]byte, len(b), len(b)) - copy(rb, b) - z := make([]byte, len(b), len(b)) - copy(rb[4:4+c], z) - - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/pac/supplemental_cred.go b/vendor/github.com/jcmturner/gokrb5/v8/pac/supplemental_cred.go deleted file mode 100644 index d40679d..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/pac/supplemental_cred.go +++ /dev/null @@ -1,87 +0,0 @@ -package pac - -import ( - "bytes" - "encoding/binary" - "errors" - "fmt" - - "github.com/jcmturner/rpc/v2/mstypes" - "github.com/jcmturner/rpc/v2/ndr" -) - -const ( - // NTLMSupCredLMOWF indicates that the LM OWF member is present and valid. - NTLMSupCredLMOWF uint32 = 31 - // NTLMSupCredNTOWF indicates that the NT OWF member is present and valid. - NTLMSupCredNTOWF uint32 = 30 -) - -// NTLMSupplementalCred implements https://msdn.microsoft.com/en-us/library/cc237949.aspx -type NTLMSupplementalCred struct { - Version uint32 // A 32-bit unsigned integer that defines the credential version.This field MUST be 0x00000000. - Flags uint32 - LMPassword []byte // A 16-element array of unsigned 8-bit integers that define the LM OWF. The LMPassword member MUST be ignored if the L flag is not set in the Flags member. - NTPassword []byte // A 16-element array of unsigned 8-bit integers that define the NT OWF. The NTPassword member MUST be ignored if the N flag is not set in the Flags member. -} - -// Unmarshal converts the bytes provided into a NTLMSupplementalCred. -func (c *NTLMSupplementalCred) Unmarshal(b []byte) (err error) { - r := mstypes.NewReader(bytes.NewReader(b)) - c.Version, err = r.Uint32() - if err != nil { - return - } - if c.Version != 0 { - err = errors.New("NTLMSupplementalCred version is not zero") - return - } - c.Flags, err = r.Uint32() - if err != nil { - return - } - if isFlagSet(c.Flags, NTLMSupCredLMOWF) { - c.LMPassword, err = r.ReadBytes(16) - if err != nil { - return - } - } - if isFlagSet(c.Flags, NTLMSupCredNTOWF) { - c.NTPassword, err = r.ReadBytes(16) - if err != nil { - return - } - } - return -} - -// isFlagSet tests if a flag is set in the uint32 little endian flag -func isFlagSet(f uint32, i uint32) bool { - //Which byte? - b := int(i / 8) - //Which bit in byte - p := uint(7 - (int(i) - 8*b)) - fb := make([]byte, 4) - binary.LittleEndian.PutUint32(fb, f) - if fb[b]&(1< - no domain specified - // \ - // @ - if strings.Contains(vc[0], `\`) { - u := strings.SplitN(vc[0], `\`, 2) - domain = u[0] - username = u[1] - } else if strings.Contains(vc[0], `@`) { - u := strings.SplitN(vc[0], `@`, 2) - domain = u[1] - username = u[0] - } else { - username = vc[0] - } - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/service/cache.go b/vendor/github.com/jcmturner/gokrb5/v8/service/cache.go deleted file mode 100644 index 038e594..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/service/cache.go +++ /dev/null @@ -1,128 +0,0 @@ -// Package service provides server side integrations for Kerberos authentication. -package service - -import ( - "github.com/jcmturner/gokrb5/v8/types" - "sync" - "time" -) - -// Replay cache is required as specified in RFC 4120 section 3.2.3 - -// Cache for tickets received from clients keyed by fully qualified client name. Used to track replay of tickets. -type Cache struct { - entries map[string]clientEntries - mux sync.RWMutex -} - -// clientEntries holds entries of client details sent to the service. -type clientEntries struct { - replayMap map[time.Time]replayCacheEntry - seqNumber int64 - subKey types.EncryptionKey -} - -// Cache entry tracking client time values of tickets sent to the service. -type replayCacheEntry struct { - presentedTime time.Time - sName types.PrincipalName - cTime time.Time // This combines the ticket's CTime and Cusec -} - -func (c *Cache) getClientEntries(cname types.PrincipalName) (clientEntries, bool) { - c.mux.RLock() - defer c.mux.RUnlock() - ce, ok := c.entries[cname.PrincipalNameString()] - return ce, ok -} - -func (c *Cache) getClientEntry(cname types.PrincipalName, t time.Time) (replayCacheEntry, bool) { - if ce, ok := c.getClientEntries(cname); ok { - c.mux.RLock() - defer c.mux.RUnlock() - if e, ok := ce.replayMap[t]; ok { - return e, true - } - } - return replayCacheEntry{}, false -} - -// Instance of the ServiceCache. This needs to be a singleton. -var replayCache Cache -var once sync.Once - -// GetReplayCache returns a pointer to the Cache singleton. -func GetReplayCache(d time.Duration) *Cache { - // Create a singleton of the ReplayCache and start a background thread to regularly clean out old entries - once.Do(func() { - replayCache = Cache{ - entries: make(map[string]clientEntries), - } - go func() { - for { - // TODO consider using a context here. - time.Sleep(d) - replayCache.ClearOldEntries(d) - } - }() - }) - return &replayCache -} - -// AddEntry adds an entry to the Cache. -func (c *Cache) AddEntry(sname types.PrincipalName, a types.Authenticator) { - ct := a.CTime.Add(time.Duration(a.Cusec) * time.Microsecond) - if ce, ok := c.getClientEntries(a.CName); ok { - c.mux.Lock() - defer c.mux.Unlock() - ce.replayMap[ct] = replayCacheEntry{ - presentedTime: time.Now().UTC(), - sName: sname, - cTime: ct, - } - ce.seqNumber = a.SeqNumber - ce.subKey = a.SubKey - } else { - c.mux.Lock() - defer c.mux.Unlock() - c.entries[a.CName.PrincipalNameString()] = clientEntries{ - replayMap: map[time.Time]replayCacheEntry{ - ct: { - presentedTime: time.Now().UTC(), - sName: sname, - cTime: ct, - }, - }, - seqNumber: a.SeqNumber, - subKey: a.SubKey, - } - } -} - -// ClearOldEntries clears entries from the Cache that are older than the duration provided. -func (c *Cache) ClearOldEntries(d time.Duration) { - c.mux.Lock() - defer c.mux.Unlock() - for ke, ce := range c.entries { - for k, e := range ce.replayMap { - if time.Now().UTC().Sub(e.presentedTime) > d { - delete(ce.replayMap, k) - } - } - if len(ce.replayMap) == 0 { - delete(c.entries, ke) - } - } -} - -// IsReplay tests if the Authenticator provided is a replay within the duration defined. If this is not a replay add the entry to the cache for tracking. -func (c *Cache) IsReplay(sname types.PrincipalName, a types.Authenticator) bool { - ct := a.CTime.Add(time.Duration(a.Cusec) * time.Microsecond) - if e, ok := c.getClientEntry(a.CName, ct); ok { - if e.sName.Equal(sname) { - return true - } - } - c.AddEntry(sname, a) - return false -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/service/settings.go b/vendor/github.com/jcmturner/gokrb5/v8/service/settings.go deleted file mode 100644 index a0370ed..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/service/settings.go +++ /dev/null @@ -1,163 +0,0 @@ -package service - -import ( - "log" - "net/http" - "time" - - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/types" -) - -// Settings defines service side configuration settings. -type Settings struct { - Keytab *keytab.Keytab - ktprinc *types.PrincipalName - sname string - requireHostAddr bool - disablePACDecoding bool - cAddr types.HostAddress - maxClockSkew time.Duration - logger *log.Logger - sessionMgr SessionMgr -} - -// NewSettings creates a new service Settings. -func NewSettings(kt *keytab.Keytab, settings ...func(*Settings)) *Settings { - s := new(Settings) - s.Keytab = kt - for _, set := range settings { - set(s) - } - return s -} - -// RequireHostAddr used to configure service side to required host addresses to be specified in Kerberos tickets. -// -// s := NewSettings(kt, RequireHostAddr(true)) -func RequireHostAddr(b bool) func(*Settings) { - return func(s *Settings) { - s.requireHostAddr = b - } -} - -// RequireHostAddr indicates if the service should require the host address to be included in the ticket. -func (s *Settings) RequireHostAddr() bool { - return s.requireHostAddr -} - -// DecodePAC used to configure service side to enable/disable PAC decoding if the PAC is present. -// Defaults to enabled if not specified. -// -// s := NewSettings(kt, DecodePAC(false)) -func DecodePAC(b bool) func(*Settings) { - return func(s *Settings) { - s.disablePACDecoding = !b - } -} - -// DecodePAC indicates whether the service should decode any PAC information present in the ticket. -func (s *Settings) DecodePAC() bool { - return !s.disablePACDecoding -} - -// ClientAddress used to configure service side with the clients host address to be used during validation. -// -// s := NewSettings(kt, ClientAddress(h)) -func ClientAddress(h types.HostAddress) func(*Settings) { - return func(s *Settings) { - s.cAddr = h - } -} - -// ClientAddress returns the client host address which has been provided to the service. -func (s *Settings) ClientAddress() types.HostAddress { - return s.cAddr -} - -// Logger used to configure service side with a logger. -// -// s := NewSettings(kt, Logger(l)) -func Logger(l *log.Logger) func(*Settings) { - return func(s *Settings) { - s.logger = l - } -} - -// Logger returns the logger instances configured for the service. If none is configured nill will be returned. -func (s *Settings) Logger() *log.Logger { - return s.logger -} - -// KeytabPrincipal used to override the principal name used to find the key in the keytab. -// -// s := NewSettings(kt, KeytabPrincipal("someaccount")) -func KeytabPrincipal(p string) func(*Settings) { - return func(s *Settings) { - pn, _ := types.ParseSPNString(p) - s.ktprinc = &pn - } -} - -// KeytabPrincipal returns the principal name used to find the key in the keytab if it has been overridden. -func (s *Settings) KeytabPrincipal() *types.PrincipalName { - return s.ktprinc -} - -// MaxClockSkew used to configure service side with the maximum acceptable clock skew -// between the service and the issue time of kerberos tickets -// -// s := NewSettings(kt, MaxClockSkew(d)) -func MaxClockSkew(d time.Duration) func(*Settings) { - return func(s *Settings) { - s.maxClockSkew = d - } -} - -// MaxClockSkew returns the maximum acceptable clock skew between the service and the issue time of kerberos tickets. -// If none is defined a duration of 5 minutes is returned. -func (s *Settings) MaxClockSkew() time.Duration { - if s.maxClockSkew.Nanoseconds() == 0 { - return time.Duration(5) * time.Minute - } - return s.maxClockSkew -} - -// SName used provide a specific service name to the service settings. -// -// s := NewSettings(kt, SName("HTTP/some.service.com")) -func SName(sname string) func(*Settings) { - return func(s *Settings) { - s.sname = sname - } -} - -// SName returns the specific service name to the service. -func (s *Settings) SName() string { - return s.sname -} - -// SessionManager configures a session manager to establish sessions with clients to avoid excessive authentication challenges. -// -// s := NewSettings(kt, SessionManager(sm)) -func SessionManager(sm SessionMgr) func(*Settings) { - return func(s *Settings) { - s.sessionMgr = sm - } -} - -// SessionManager returns any configured session manager. -func (s *Settings) SessionManager() SessionMgr { - return s.sessionMgr -} - -// SessionMgr must provide a ways to: -// -// - Create new sessions and in the process add a value to the session under the key provided. -// -// - Get an existing session returning the value in the session under the key provided. -// Return nil bytes and/or error if there is no session. -type SessionMgr interface { - New(w http.ResponseWriter, r *http.Request, k string, v []byte) error - Get(r *http.Request, k string) ([]byte, error) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/spnego/http.go b/vendor/github.com/jcmturner/gokrb5/v8/spnego/http.go deleted file mode 100644 index 4e1d2bd..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/spnego/http.go +++ /dev/null @@ -1,373 +0,0 @@ -package spnego - -import ( - "bytes" - "encoding/base64" - "errors" - "fmt" - "io" - "io/ioutil" - "net" - "net/http" - "net/http/cookiejar" - "net/url" - "strings" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/goidentity/v6" - "github.com/jcmturner/gokrb5/v8/client" - "github.com/jcmturner/gokrb5/v8/credentials" - "github.com/jcmturner/gokrb5/v8/gssapi" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/service" - "github.com/jcmturner/gokrb5/v8/types" -) - -// Client side functionality // - -// Client will negotiate authentication with a server using SPNEGO. -type Client struct { - *http.Client - krb5Client *client.Client - spn string - reqs []*http.Request -} - -type redirectErr struct { - reqTarget *http.Request -} - -func (e redirectErr) Error() string { - return fmt.Sprintf("redirect to %v", e.reqTarget.URL) -} - -type teeReadCloser struct { - io.Reader - io.Closer -} - -// NewClient returns a SPNEGO enabled HTTP client. -// Be careful when passing in the *http.Client if it is beginning reused in multiple calls to this function. -// Ensure reuse of the provided *http.Client is for the same user as a session cookie may have been added to -// http.Client's cookie jar. -// Incorrect reuse of the provided *http.Client could lead to access to the wrong user's session. -func NewClient(krb5Cl *client.Client, httpCl *http.Client, spn string) *Client { - if httpCl == nil { - httpCl = &http.Client{} - } - // Add a cookie jar if there isn't one - if httpCl.Jar == nil { - httpCl.Jar, _ = cookiejar.New(nil) - } - // Add a CheckRedirect function that will execute any functional already defined and then error with a redirectErr - f := httpCl.CheckRedirect - httpCl.CheckRedirect = func(req *http.Request, via []*http.Request) error { - if f != nil { - err := f(req, via) - if err != nil { - return err - } - } - return redirectErr{reqTarget: req} - } - return &Client{ - Client: httpCl, - krb5Client: krb5Cl, - spn: spn, - } -} - -// Do is the SPNEGO enabled HTTP client's equivalent of the http.Client's Do method. -func (c *Client) Do(req *http.Request) (resp *http.Response, err error) { - var body bytes.Buffer - if req.Body != nil { - // Use a tee reader to capture any body sent in case we have to replay it again - teeR := io.TeeReader(req.Body, &body) - teeRC := teeReadCloser{teeR, req.Body} - req.Body = teeRC - } - resp, err = c.Client.Do(req) - if err != nil { - if ue, ok := err.(*url.Error); ok { - if e, ok := ue.Err.(redirectErr); ok { - // Picked up a redirect - e.reqTarget.Header.Del(HTTPHeaderAuthRequest) - c.reqs = append(c.reqs, e.reqTarget) - if len(c.reqs) >= 10 { - return resp, errors.New("stopped after 10 redirects") - } - if req.Body != nil { - // Refresh the body reader so the body can be sent again - e.reqTarget.Body = ioutil.NopCloser(&body) - } - return c.Do(e.reqTarget) - } - } - return resp, err - } - if respUnauthorizedNegotiate(resp) { - err := SetSPNEGOHeader(c.krb5Client, req, c.spn) - if err != nil { - return resp, err - } - if req.Body != nil { - // Refresh the body reader so the body can be sent again - req.Body = ioutil.NopCloser(&body) - } - return c.Do(req) - } - return resp, err -} - -// Get is the SPNEGO enabled HTTP client's equivalent of the http.Client's Get method. -func (c *Client) Get(url string) (resp *http.Response, err error) { - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return nil, err - } - return c.Do(req) -} - -// Post is the SPNEGO enabled HTTP client's equivalent of the http.Client's Post method. -func (c *Client) Post(url, contentType string, body io.Reader) (resp *http.Response, err error) { - req, err := http.NewRequest("POST", url, body) - if err != nil { - return nil, err - } - req.Header.Set("Content-Type", contentType) - return c.Do(req) -} - -// PostForm is the SPNEGO enabled HTTP client's equivalent of the http.Client's PostForm method. -func (c *Client) PostForm(url string, data url.Values) (resp *http.Response, err error) { - return c.Post(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode())) -} - -// Head is the SPNEGO enabled HTTP client's equivalent of the http.Client's Head method. -func (c *Client) Head(url string) (resp *http.Response, err error) { - req, err := http.NewRequest("HEAD", url, nil) - if err != nil { - return nil, err - } - return c.Do(req) -} - -func respUnauthorizedNegotiate(resp *http.Response) bool { - if resp.StatusCode == http.StatusUnauthorized { - if resp.Header.Get(HTTPHeaderAuthResponse) == HTTPHeaderAuthResponseValueKey { - return true - } - } - return false -} - -// SetSPNEGOHeader gets the service ticket and sets it as the SPNEGO authorization header on HTTP request object. -// To auto generate the SPN from the request object pass a null string "". -func SetSPNEGOHeader(cl *client.Client, r *http.Request, spn string) error { - if spn == "" { - h := strings.TrimSuffix(strings.SplitN(r.URL.Host, ":", 2)[0], ".") - name, err := net.LookupCNAME(h) - if err == nil { - // Underlyng canonical name should be used for SPN - h = strings.TrimSuffix(name, ".") - } - spn = "HTTP/" + h - r.Host = h - } - cl.Log("using SPN %s", spn) - s := SPNEGOClient(cl, spn) - err := s.AcquireCred() - if err != nil { - return fmt.Errorf("could not acquire client credential: %v", err) - } - st, err := s.InitSecContext() - if err != nil { - return fmt.Errorf("could not initialize context: %v", err) - } - nb, err := st.Marshal() - if err != nil { - return krberror.Errorf(err, krberror.EncodingError, "could not marshal SPNEGO") - } - hs := "Negotiate " + base64.StdEncoding.EncodeToString(nb) - r.Header.Set(HTTPHeaderAuthRequest, hs) - return nil -} - -// Service side functionality // - -const ( - // spnegoNegTokenRespKRBAcceptCompleted - The response on successful authentication always has this header. Capturing as const so we don't have marshaling and encoding overhead. - spnegoNegTokenRespKRBAcceptCompleted = "Negotiate oRQwEqADCgEAoQsGCSqGSIb3EgECAg==" - // spnegoNegTokenRespReject - The response on a failed authentication always has this rejection header. Capturing as const so we don't have marshaling and encoding overhead. - spnegoNegTokenRespReject = "Negotiate oQcwBaADCgEC" - // spnegoNegTokenRespIncompleteKRB5 - Response token specifying incomplete context and KRB5 as the supported mechtype. - spnegoNegTokenRespIncompleteKRB5 = "Negotiate oRQwEqADCgEBoQsGCSqGSIb3EgECAg==" - // sessionCredentials is the session value key holding the credentials jcmturner/goidentity/Identity object. - sessionCredentials = "github.com/jcmturner/gokrb5/v8/sessionCredentials" - // ctxCredentials is the SPNEGO context key holding the credentials jcmturner/goidentity/Identity object. - ctxCredentials = "github.com/jcmturner/gokrb5/v8/ctxCredentials" - // HTTPHeaderAuthRequest is the header that will hold authn/z information. - HTTPHeaderAuthRequest = "Authorization" - // HTTPHeaderAuthResponse is the header that will hold SPNEGO data from the server. - HTTPHeaderAuthResponse = "WWW-Authenticate" - // HTTPHeaderAuthResponseValueKey is the key in the auth header for SPNEGO. - HTTPHeaderAuthResponseValueKey = "Negotiate" - // UnauthorizedMsg is the message returned in the body when authentication fails. - UnauthorizedMsg = "Unauthorised.\n" -) - -// SPNEGOKRB5Authenticate is a Kerberos SPNEGO authentication HTTP handler wrapper. -func SPNEGOKRB5Authenticate(inner http.Handler, kt *keytab.Keytab, settings ...func(*service.Settings)) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // Set up the SPNEGO GSS-API mechanism - var spnego *SPNEGO - h, err := types.GetHostAddress(r.RemoteAddr) - if err == nil { - // put in this order so that if the user provides a ClientAddress it will override the one here. - o := append([]func(*service.Settings){service.ClientAddress(h)}, settings...) - spnego = SPNEGOService(kt, o...) - } else { - spnego = SPNEGOService(kt, settings...) - spnego.Log("%s - SPNEGO could not parse client address: %v", r.RemoteAddr, err) - } - - // Check if there is a session manager and if there is an already established session for this client - id, err := getSessionCredentials(spnego, r) - if err == nil && id.Authenticated() { - // There is an established session so bypass auth and serve - spnego.Log("%s - SPNEGO request served under session %s", r.RemoteAddr, id.SessionID()) - inner.ServeHTTP(w, goidentity.AddToHTTPRequestContext(&id, r)) - return - } - - st, err := getAuthorizationNegotiationHeaderAsSPNEGOToken(spnego, r, w) - if st == nil || err != nil { - // response to client and logging handled in function above so just return - return - } - - // Validate the context token - authed, ctx, status := spnego.AcceptSecContext(st) - if status.Code != gssapi.StatusComplete && status.Code != gssapi.StatusContinueNeeded { - spnegoResponseReject(spnego, w, "%s - SPNEGO validation error: %v", r.RemoteAddr, status) - return - } - if status.Code == gssapi.StatusContinueNeeded { - spnegoNegotiateKRB5MechType(spnego, w, "%s - SPNEGO GSS-API continue needed", r.RemoteAddr) - return - } - - if authed { - // Authentication successful; get user's credentials from the context - id := ctx.Value(ctxCredentials).(*credentials.Credentials) - // Create a new session if a session manager has been configured - err = newSession(spnego, r, w, id) - if err != nil { - return - } - spnegoResponseAcceptCompleted(spnego, w, "%s %s@%s - SPNEGO authentication succeeded", r.RemoteAddr, id.UserName(), id.Domain()) - // Add the identity to the context and serve the inner/wrapped handler - inner.ServeHTTP(w, goidentity.AddToHTTPRequestContext(id, r)) - return - } - // If we get to here we have not authenticationed so just reject - spnegoResponseReject(spnego, w, "%s - SPNEGO Kerberos authentication failed", r.RemoteAddr) - return - }) -} - -func getAuthorizationNegotiationHeaderAsSPNEGOToken(spnego *SPNEGO, r *http.Request, w http.ResponseWriter) (*SPNEGOToken, error) { - s := strings.SplitN(r.Header.Get(HTTPHeaderAuthRequest), " ", 2) - if len(s) != 2 || s[0] != HTTPHeaderAuthResponseValueKey { - // No Authorization header set so return 401 with WWW-Authenticate Negotiate header - w.Header().Set(HTTPHeaderAuthResponse, HTTPHeaderAuthResponseValueKey) - http.Error(w, UnauthorizedMsg, http.StatusUnauthorized) - return nil, errors.New("client did not provide a negotiation authorization header") - } - - // Decode the header into an SPNEGO context token - b, err := base64.StdEncoding.DecodeString(s[1]) - if err != nil { - err = fmt.Errorf("error in base64 decoding negotiation header: %v", err) - spnegoNegotiateKRB5MechType(spnego, w, "%s - SPNEGO %v", r.RemoteAddr, err) - return nil, err - } - var st SPNEGOToken - err = st.Unmarshal(b) - if err != nil { - // Check if this is a raw KRB5 context token - issue #347. - var k5t KRB5Token - if k5t.Unmarshal(b) != nil { - err = fmt.Errorf("error in unmarshaling SPNEGO token: %v", err) - spnegoNegotiateKRB5MechType(spnego, w, "%s - SPNEGO %v", r.RemoteAddr, err) - return nil, err - } - // Wrap it into an SPNEGO context token - st.Init = true - st.NegTokenInit = NegTokenInit{ - MechTypes: []asn1.ObjectIdentifier{k5t.OID}, - MechTokenBytes: b, - } - } - return &st, nil -} - -func getSessionCredentials(spnego *SPNEGO, r *http.Request) (credentials.Credentials, error) { - var creds credentials.Credentials - // Check if there is a session manager and if there is an already established session for this client - if sm := spnego.serviceSettings.SessionManager(); sm != nil { - cb, err := sm.Get(r, sessionCredentials) - if err != nil || cb == nil || len(cb) < 1 { - return creds, fmt.Errorf("%s - SPNEGO error getting session and credentials for request: %v", r.RemoteAddr, err) - } - err = creds.Unmarshal(cb) - if err != nil { - return creds, fmt.Errorf("%s - SPNEGO credentials malformed in session: %v", r.RemoteAddr, err) - } - return creds, nil - } - return creds, errors.New("no session manager configured") -} - -func newSession(spnego *SPNEGO, r *http.Request, w http.ResponseWriter, id *credentials.Credentials) error { - if sm := spnego.serviceSettings.SessionManager(); sm != nil { - // create new session - idb, err := id.Marshal() - if err != nil { - spnegoInternalServerError(spnego, w, "SPNEGO could not marshal credentials to add to the session: %v", err) - return err - } - err = sm.New(w, r, sessionCredentials, idb) - if err != nil { - spnegoInternalServerError(spnego, w, "SPNEGO could not create new session: %v", err) - return err - } - spnego.Log("%s %s@%s - SPNEGO new session (%s) created", r.RemoteAddr, id.UserName(), id.Domain(), id.SessionID()) - } - return nil -} - -// Log and respond to client for error conditions - -func spnegoNegotiateKRB5MechType(s *SPNEGO, w http.ResponseWriter, format string, v ...interface{}) { - s.Log(format, v...) - w.Header().Set(HTTPHeaderAuthResponse, spnegoNegTokenRespIncompleteKRB5) - http.Error(w, UnauthorizedMsg, http.StatusUnauthorized) -} - -func spnegoResponseReject(s *SPNEGO, w http.ResponseWriter, format string, v ...interface{}) { - s.Log(format, v...) - w.Header().Set(HTTPHeaderAuthResponse, spnegoNegTokenRespReject) - http.Error(w, UnauthorizedMsg, http.StatusUnauthorized) -} - -func spnegoResponseAcceptCompleted(s *SPNEGO, w http.ResponseWriter, format string, v ...interface{}) { - s.Log(format, v...) - w.Header().Set(HTTPHeaderAuthResponse, spnegoNegTokenRespKRBAcceptCompleted) -} - -func spnegoInternalServerError(s *SPNEGO, w http.ResponseWriter, format string, v ...interface{}) { - s.Log(format, v...) - http.Error(w, "Internal Server Error", http.StatusInternalServerError) -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/spnego/krb5Token.go b/vendor/github.com/jcmturner/gokrb5/v8/spnego/krb5Token.go deleted file mode 100644 index 43f8a82..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/spnego/krb5Token.go +++ /dev/null @@ -1,218 +0,0 @@ -package spnego - -import ( - "context" - "encoding/binary" - "encoding/hex" - "errors" - "fmt" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/client" - "github.com/jcmturner/gokrb5/v8/credentials" - "github.com/jcmturner/gokrb5/v8/gssapi" - "github.com/jcmturner/gokrb5/v8/iana/chksumtype" - "github.com/jcmturner/gokrb5/v8/iana/msgtype" - "github.com/jcmturner/gokrb5/v8/krberror" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/service" - "github.com/jcmturner/gokrb5/v8/types" -) - -// GSSAPI KRB5 MechToken IDs. -const ( - TOK_ID_KRB_AP_REQ = "0100" - TOK_ID_KRB_AP_REP = "0200" - TOK_ID_KRB_ERROR = "0300" -) - -// KRB5Token context token implementation for GSSAPI. -type KRB5Token struct { - OID asn1.ObjectIdentifier - tokID []byte - APReq messages.APReq - APRep messages.APRep - KRBError messages.KRBError - settings *service.Settings - context context.Context -} - -// Marshal a KRB5Token into a slice of bytes. -func (m *KRB5Token) Marshal() ([]byte, error) { - // Create the header - b, _ := asn1.Marshal(m.OID) - b = append(b, m.tokID...) - var tb []byte - var err error - switch hex.EncodeToString(m.tokID) { - case TOK_ID_KRB_AP_REQ: - tb, err = m.APReq.Marshal() - if err != nil { - return []byte{}, fmt.Errorf("error marshalling AP_REQ for MechToken: %v", err) - } - case TOK_ID_KRB_AP_REP: - return []byte{}, errors.New("marshal of AP_REP GSSAPI MechToken not supported by gokrb5") - case TOK_ID_KRB_ERROR: - return []byte{}, errors.New("marshal of KRB_ERROR GSSAPI MechToken not supported by gokrb5") - } - if err != nil { - return []byte{}, fmt.Errorf("error mashalling kerberos message within mech token: %v", err) - } - b = append(b, tb...) - return asn1tools.AddASNAppTag(b, 0), nil -} - -// Unmarshal a KRB5Token. -func (m *KRB5Token) Unmarshal(b []byte) error { - var oid asn1.ObjectIdentifier - r, err := asn1.UnmarshalWithParams(b, &oid, fmt.Sprintf("application,explicit,tag:%v", 0)) - if err != nil { - return fmt.Errorf("error unmarshalling KRB5Token OID: %v", err) - } - if !oid.Equal(gssapi.OIDKRB5.OID()) { - return fmt.Errorf("error unmarshalling KRB5Token, OID is %s not %s", oid.String(), gssapi.OIDKRB5.OID().String()) - } - m.OID = oid - if len(r) < 2 { - return fmt.Errorf("krb5token too short") - } - m.tokID = r[0:2] - switch hex.EncodeToString(m.tokID) { - case TOK_ID_KRB_AP_REQ: - var a messages.APReq - err = a.Unmarshal(r[2:]) - if err != nil { - return fmt.Errorf("error unmarshalling KRB5Token AP_REQ: %v", err) - } - m.APReq = a - case TOK_ID_KRB_AP_REP: - var a messages.APRep - err = a.Unmarshal(r[2:]) - if err != nil { - return fmt.Errorf("error unmarshalling KRB5Token AP_REP: %v", err) - } - m.APRep = a - case TOK_ID_KRB_ERROR: - var a messages.KRBError - err = a.Unmarshal(r[2:]) - if err != nil { - return fmt.Errorf("error unmarshalling KRB5Token KRBError: %v", err) - } - m.KRBError = a - } - return nil -} - -// Verify a KRB5Token. -func (m *KRB5Token) Verify() (bool, gssapi.Status) { - switch hex.EncodeToString(m.tokID) { - case TOK_ID_KRB_AP_REQ: - ok, creds, err := service.VerifyAPREQ(&m.APReq, m.settings) - if err != nil { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: err.Error()} - } - if !ok { - return false, gssapi.Status{Code: gssapi.StatusDefectiveCredential, Message: "KRB5_AP_REQ token not valid"} - } - m.context = context.Background() - m.context = context.WithValue(m.context, ctxCredentials, creds) - return true, gssapi.Status{Code: gssapi.StatusComplete} - case TOK_ID_KRB_AP_REP: - // Client side - // TODO how to verify the AP_REP - not yet implemented - return false, gssapi.Status{Code: gssapi.StatusFailure, Message: "verifying an AP_REP is not currently supported by gokrb5"} - case TOK_ID_KRB_ERROR: - if m.KRBError.MsgType != msgtype.KRB_ERROR { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "KRB5_Error token not valid"} - } - return true, gssapi.Status{Code: gssapi.StatusUnavailable} - } - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "unknown TOK_ID in KRB5 token"} -} - -// IsAPReq tests if the MechToken contains an AP_REQ. -func (m *KRB5Token) IsAPReq() bool { - if hex.EncodeToString(m.tokID) == TOK_ID_KRB_AP_REQ { - return true - } - return false -} - -// IsAPRep tests if the MechToken contains an AP_REP. -func (m *KRB5Token) IsAPRep() bool { - if hex.EncodeToString(m.tokID) == TOK_ID_KRB_AP_REP { - return true - } - return false -} - -// IsKRBError tests if the MechToken contains an KRB_ERROR. -func (m *KRB5Token) IsKRBError() bool { - if hex.EncodeToString(m.tokID) == TOK_ID_KRB_ERROR { - return true - } - return false -} - -// Context returns the KRB5 token's context which will contain any verify user identity information. -func (m *KRB5Token) Context() context.Context { - return m.context -} - -// NewKRB5TokenAPREQ creates a new KRB5 token with AP_REQ -func NewKRB5TokenAPREQ(cl *client.Client, tkt messages.Ticket, sessionKey types.EncryptionKey, GSSAPIFlags []int, APOptions []int) (KRB5Token, error) { - // TODO consider providing the SPN rather than the specific tkt and key and get these from the krb client. - var m KRB5Token - m.OID = gssapi.OIDKRB5.OID() - tb, _ := hex.DecodeString(TOK_ID_KRB_AP_REQ) - m.tokID = tb - - auth, err := krb5TokenAuthenticator(cl.Credentials, GSSAPIFlags) - if err != nil { - return m, err - } - APReq, err := messages.NewAPReq( - tkt, - sessionKey, - auth, - ) - if err != nil { - return m, err - } - for _, o := range APOptions { - types.SetFlag(&APReq.APOptions, o) - } - m.APReq = APReq - return m, nil -} - -// krb5TokenAuthenticator creates a new kerberos authenticator for kerberos MechToken -func krb5TokenAuthenticator(creds *credentials.Credentials, flags []int) (types.Authenticator, error) { - //RFC 4121 Section 4.1.1 - auth, err := types.NewAuthenticator(creds.Domain(), creds.CName()) - if err != nil { - return auth, krberror.Errorf(err, krberror.KRBMsgError, "error generating new authenticator") - } - auth.Cksum = types.Checksum{ - CksumType: chksumtype.GSSAPI, - Checksum: newAuthenticatorChksum(flags), - } - return auth, nil -} - -// Create new authenticator checksum for kerberos MechToken -func newAuthenticatorChksum(flags []int) []byte { - a := make([]byte, 24) - binary.LittleEndian.PutUint32(a[:4], 16) - for _, i := range flags { - if i == gssapi.ContextFlagDeleg { - x := make([]byte, 28-len(a)) - a = append(a, x...) - } - f := binary.LittleEndian.Uint32(a[20:24]) - f |= uint32(i) - binary.LittleEndian.PutUint32(a[20:24], f) - } - return a -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/spnego/negotiationToken.go b/vendor/github.com/jcmturner/gokrb5/v8/spnego/negotiationToken.go deleted file mode 100644 index 409ffcf..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/spnego/negotiationToken.go +++ /dev/null @@ -1,302 +0,0 @@ -package spnego - -import ( - "context" - "errors" - "fmt" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/client" - "github.com/jcmturner/gokrb5/v8/gssapi" - "github.com/jcmturner/gokrb5/v8/messages" - "github.com/jcmturner/gokrb5/v8/service" - "github.com/jcmturner/gokrb5/v8/types" -) - -// https://msdn.microsoft.com/en-us/library/ms995330.aspx - -// Negotiation state values. -const ( - NegStateAcceptCompleted NegState = 0 - NegStateAcceptIncomplete NegState = 1 - NegStateReject NegState = 2 - NegStateRequestMIC NegState = 3 -) - -// NegState is a type to indicate the SPNEGO negotiation state. -type NegState int - -// NegTokenInit implements Negotiation Token of type Init. -type NegTokenInit struct { - MechTypes []asn1.ObjectIdentifier - ReqFlags gssapi.ContextFlags - MechTokenBytes []byte - MechListMIC []byte - mechToken gssapi.ContextToken - settings *service.Settings -} - -type marshalNegTokenInit struct { - MechTypes []asn1.ObjectIdentifier `asn1:"explicit,tag:0"` - ReqFlags gssapi.ContextFlags `asn1:"explicit,optional,tag:1"` - MechTokenBytes []byte `asn1:"explicit,optional,omitempty,tag:2"` - MechListMIC []byte `asn1:"explicit,optional,omitempty,tag:3"` // This field is not used when negotiating Kerberos tokens -} - -// NegTokenResp implements Negotiation Token of type Resp/Targ -type NegTokenResp struct { - NegState asn1.Enumerated - SupportedMech asn1.ObjectIdentifier - ResponseToken []byte - MechListMIC []byte - mechToken gssapi.ContextToken - settings *service.Settings -} - -type marshalNegTokenResp struct { - NegState asn1.Enumerated `asn1:"explicit,tag:0"` - SupportedMech asn1.ObjectIdentifier `asn1:"explicit,optional,tag:1"` - ResponseToken []byte `asn1:"explicit,optional,omitempty,tag:2"` - MechListMIC []byte `asn1:"explicit,optional,omitempty,tag:3"` // This field is not used when negotiating Kerberos tokens -} - -// NegTokenTarg implements Negotiation Token of type Resp/Targ -type NegTokenTarg NegTokenResp - -// Marshal an Init negotiation token -func (n *NegTokenInit) Marshal() ([]byte, error) { - m := marshalNegTokenInit{ - MechTypes: n.MechTypes, - ReqFlags: n.ReqFlags, - MechTokenBytes: n.MechTokenBytes, - MechListMIC: n.MechListMIC, - } - b, err := asn1.Marshal(m) - if err != nil { - return nil, err - } - nt := asn1.RawValue{ - Tag: 0, - Class: 2, - IsCompound: true, - Bytes: b, - } - nb, err := asn1.Marshal(nt) - if err != nil { - return nil, err - } - return nb, nil -} - -// Unmarshal an Init negotiation token -func (n *NegTokenInit) Unmarshal(b []byte) error { - init, nt, err := UnmarshalNegToken(b) - if err != nil { - return err - } - if !init { - return errors.New("bytes were not that of a NegTokenInit") - } - nInit := nt.(NegTokenInit) - n.MechTokenBytes = nInit.MechTokenBytes - n.MechListMIC = nInit.MechListMIC - n.MechTypes = nInit.MechTypes - n.ReqFlags = nInit.ReqFlags - return nil -} - -// Verify an Init negotiation token -func (n *NegTokenInit) Verify() (bool, gssapi.Status) { - // Check if supported mechanisms are in the MechTypeList - var mtSupported bool - for _, m := range n.MechTypes { - if m.Equal(gssapi.OIDKRB5.OID()) || m.Equal(gssapi.OIDMSLegacyKRB5.OID()) { - if n.mechToken == nil && n.MechTokenBytes == nil { - return false, gssapi.Status{Code: gssapi.StatusContinueNeeded} - } - mtSupported = true - break - } - } - if !mtSupported { - return false, gssapi.Status{Code: gssapi.StatusBadMech, Message: "no supported mechanism specified in negotiation"} - } - // There should be some mechtoken bytes for a KRB5Token (other mech types are not supported) - mt := new(KRB5Token) - mt.settings = n.settings - if n.mechToken == nil { - err := mt.Unmarshal(n.MechTokenBytes) - if err != nil { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: err.Error()} - } - n.mechToken = mt - } else { - var ok bool - mt, ok = n.mechToken.(*KRB5Token) - if !ok { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "MechToken is not a KRB5 token as expected"} - } - } - // Verify the mechtoken - return n.mechToken.Verify() -} - -// Context returns the SPNEGO context which will contain any verify user identity information. -func (n *NegTokenInit) Context() context.Context { - if n.mechToken != nil { - mt, ok := n.mechToken.(*KRB5Token) - if !ok { - return nil - } - return mt.Context() - } - return nil -} - -// Marshal a Resp/Targ negotiation token -func (n *NegTokenResp) Marshal() ([]byte, error) { - m := marshalNegTokenResp{ - NegState: n.NegState, - SupportedMech: n.SupportedMech, - ResponseToken: n.ResponseToken, - MechListMIC: n.MechListMIC, - } - b, err := asn1.Marshal(m) - if err != nil { - return nil, err - } - nt := asn1.RawValue{ - Tag: 1, - Class: 2, - IsCompound: true, - Bytes: b, - } - nb, err := asn1.Marshal(nt) - if err != nil { - return nil, err - } - return nb, nil -} - -// Unmarshal a Resp/Targ negotiation token -func (n *NegTokenResp) Unmarshal(b []byte) error { - init, nt, err := UnmarshalNegToken(b) - if err != nil { - return err - } - if init { - return errors.New("bytes were not that of a NegTokenResp") - } - nResp := nt.(NegTokenResp) - n.MechListMIC = nResp.MechListMIC - n.NegState = nResp.NegState - n.ResponseToken = nResp.ResponseToken - n.SupportedMech = nResp.SupportedMech - return nil -} - -// Verify a Resp/Targ negotiation token -func (n *NegTokenResp) Verify() (bool, gssapi.Status) { - if n.SupportedMech.Equal(gssapi.OIDKRB5.OID()) || n.SupportedMech.Equal(gssapi.OIDMSLegacyKRB5.OID()) { - if n.mechToken == nil && n.ResponseToken == nil { - return false, gssapi.Status{Code: gssapi.StatusContinueNeeded} - } - mt := new(KRB5Token) - mt.settings = n.settings - if n.mechToken == nil { - err := mt.Unmarshal(n.ResponseToken) - if err != nil { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: err.Error()} - } - n.mechToken = mt - } else { - var ok bool - mt, ok = n.mechToken.(*KRB5Token) - if !ok { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "MechToken is not a KRB5 token as expected"} - } - } - if mt == nil { - return false, gssapi.Status{Code: gssapi.StatusContinueNeeded} - } - // Verify the mechtoken - return mt.Verify() - } - return false, gssapi.Status{Code: gssapi.StatusBadMech, Message: "no supported mechanism specified in negotiation"} -} - -// State returns the negotiation state of the negotiation response. -func (n *NegTokenResp) State() NegState { - return NegState(n.NegState) -} - -// Context returns the SPNEGO context which will contain any verify user identity information. -func (n *NegTokenResp) Context() context.Context { - if n.mechToken != nil { - mt, ok := n.mechToken.(*KRB5Token) - if !ok { - return nil - } - return mt.Context() - } - return nil -} - -// UnmarshalNegToken umarshals and returns either a NegTokenInit or a NegTokenResp. -// -// The boolean indicates if the response is a NegTokenInit. -// If error is nil and the boolean is false the response is a NegTokenResp. -func UnmarshalNegToken(b []byte) (bool, interface{}, error) { - var a asn1.RawValue - _, err := asn1.Unmarshal(b, &a) - if err != nil { - return false, nil, fmt.Errorf("error unmarshalling NegotiationToken: %v", err) - } - switch a.Tag { - case 0: - var n marshalNegTokenInit - _, err = asn1.Unmarshal(a.Bytes, &n) - if err != nil { - return false, nil, fmt.Errorf("error unmarshalling NegotiationToken type %d (Init): %v", a.Tag, err) - } - nt := NegTokenInit{ - MechTypes: n.MechTypes, - ReqFlags: n.ReqFlags, - MechTokenBytes: n.MechTokenBytes, - MechListMIC: n.MechListMIC, - } - return true, nt, nil - case 1: - var n marshalNegTokenResp - _, err = asn1.Unmarshal(a.Bytes, &n) - if err != nil { - return false, nil, fmt.Errorf("error unmarshalling NegotiationToken type %d (Resp/Targ): %v", a.Tag, err) - } - nt := NegTokenResp{ - NegState: n.NegState, - SupportedMech: n.SupportedMech, - ResponseToken: n.ResponseToken, - MechListMIC: n.MechListMIC, - } - return false, nt, nil - default: - return false, nil, errors.New("unknown choice type for NegotiationToken") - } - -} - -// NewNegTokenInitKRB5 creates new Init negotiation token for Kerberos 5 -func NewNegTokenInitKRB5(cl *client.Client, tkt messages.Ticket, sessionKey types.EncryptionKey) (NegTokenInit, error) { - mt, err := NewKRB5TokenAPREQ(cl, tkt, sessionKey, []int{gssapi.ContextFlagInteg, gssapi.ContextFlagConf}, []int{}) - if err != nil { - return NegTokenInit{}, fmt.Errorf("error getting KRB5 token; %v", err) - } - mtb, err := mt.Marshal() - if err != nil { - return NegTokenInit{}, fmt.Errorf("error marshalling KRB5 token; %v", err) - } - return NegTokenInit{ - MechTypes: []asn1.ObjectIdentifier{gssapi.OIDKRB5.OID()}, - MechTokenBytes: mtb, - }, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/spnego/spnego.go b/vendor/github.com/jcmturner/gokrb5/v8/spnego/spnego.go deleted file mode 100644 index ebb818b..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/spnego/spnego.go +++ /dev/null @@ -1,203 +0,0 @@ -// Package spnego implements the Simple and Protected GSSAPI Negotiation Mechanism for Kerberos authentication. -package spnego - -import ( - "context" - "errors" - "fmt" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/client" - "github.com/jcmturner/gokrb5/v8/gssapi" - "github.com/jcmturner/gokrb5/v8/keytab" - "github.com/jcmturner/gokrb5/v8/service" -) - -// SPNEGO implements the GSS-API mechanism for RFC 4178 -type SPNEGO struct { - serviceSettings *service.Settings - client *client.Client - spn string -} - -// SPNEGOClient configures the SPNEGO mechanism suitable for client side use. -func SPNEGOClient(cl *client.Client, spn string) *SPNEGO { - s := new(SPNEGO) - s.client = cl - s.spn = spn - s.serviceSettings = service.NewSettings(nil, service.SName(spn)) - return s -} - -// SPNEGOService configures the SPNEGO mechanism suitable for service side use. -func SPNEGOService(kt *keytab.Keytab, options ...func(*service.Settings)) *SPNEGO { - s := new(SPNEGO) - s.serviceSettings = service.NewSettings(kt, options...) - return s -} - -// OID returns the GSS-API assigned OID for SPNEGO. -func (s *SPNEGO) OID() asn1.ObjectIdentifier { - return gssapi.OIDSPNEGO.OID() -} - -// AcquireCred is the GSS-API method to acquire a client credential via Kerberos for SPNEGO. -func (s *SPNEGO) AcquireCred() error { - return s.client.AffirmLogin() -} - -// InitSecContext is the GSS-API method for the client to a generate a context token to the service via Kerberos. -func (s *SPNEGO) InitSecContext() (gssapi.ContextToken, error) { - tkt, key, err := s.client.GetServiceTicket(s.spn) - if err != nil { - return &SPNEGOToken{}, err - } - negTokenInit, err := NewNegTokenInitKRB5(s.client, tkt, key) - if err != nil { - return &SPNEGOToken{}, fmt.Errorf("could not create NegTokenInit: %v", err) - } - return &SPNEGOToken{ - Init: true, - NegTokenInit: negTokenInit, - settings: s.serviceSettings, - }, nil -} - -// AcceptSecContext is the GSS-API method for the service to verify the context token provided by the client and -// establish a context. -func (s *SPNEGO) AcceptSecContext(ct gssapi.ContextToken) (bool, context.Context, gssapi.Status) { - var ctx context.Context - t, ok := ct.(*SPNEGOToken) - if !ok { - return false, ctx, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "context token provided was not an SPNEGO token"} - } - t.settings = s.serviceSettings - var oid asn1.ObjectIdentifier - if t.Init { - oid = t.NegTokenInit.MechTypes[0] - } - if t.Resp { - oid = t.NegTokenResp.SupportedMech - } - if !(oid.Equal(gssapi.OIDKRB5.OID()) || oid.Equal(gssapi.OIDMSLegacyKRB5.OID())) { - return false, ctx, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "SPNEGO OID of MechToken is not of type KRB5"} - } - // Flags in the NegInit must be used t.NegTokenInit.ReqFlags - ok, status := t.Verify() - ctx = t.Context() - return ok, ctx, status -} - -// Log will write to the service's logger if it is configured. -func (s *SPNEGO) Log(format string, v ...interface{}) { - if s.serviceSettings.Logger() != nil { - s.serviceSettings.Logger().Output(2, fmt.Sprintf(format, v...)) - } -} - -// SPNEGOToken is a GSS-API context token -type SPNEGOToken struct { - Init bool - Resp bool - NegTokenInit NegTokenInit - NegTokenResp NegTokenResp - settings *service.Settings - context context.Context -} - -// Marshal SPNEGO context token -func (s *SPNEGOToken) Marshal() ([]byte, error) { - var b []byte - if s.Init { - hb, _ := asn1.Marshal(gssapi.OIDSPNEGO.OID()) - tb, err := s.NegTokenInit.Marshal() - if err != nil { - return b, fmt.Errorf("could not marshal NegTokenInit: %v", err) - } - b = append(hb, tb...) - return asn1tools.AddASNAppTag(b, 0), nil - } - if s.Resp { - b, err := s.NegTokenResp.Marshal() - if err != nil { - return b, fmt.Errorf("could not marshal NegTokenResp: %v", err) - } - return b, nil - } - return b, errors.New("SPNEGO cannot be marshalled. It contains neither a NegTokenInit or NegTokenResp") -} - -// Unmarshal SPNEGO context token -func (s *SPNEGOToken) Unmarshal(b []byte) error { - var r []byte - var err error - // We need some data in the array - if len(b) < 1 { - return fmt.Errorf("provided byte array is empty") - } - if b[0] != byte(161) { - // Not a NegTokenResp/Targ could be a NegTokenInit - var oid asn1.ObjectIdentifier - r, err = asn1.UnmarshalWithParams(b, &oid, fmt.Sprintf("application,explicit,tag:%v", 0)) - if err != nil { - return fmt.Errorf("not a valid SPNEGO token: %v", err) - } - // Check the OID is the SPNEGO OID value - SPNEGOOID := gssapi.OIDSPNEGO.OID() - if !oid.Equal(SPNEGOOID) { - return fmt.Errorf("OID %s does not match SPNEGO OID %s", oid.String(), SPNEGOOID.String()) - } - } else { - // Could be a NegTokenResp/Targ - r = b - } - - _, nt, err := UnmarshalNegToken(r) - if err != nil { - return err - } - switch v := nt.(type) { - case NegTokenInit: - s.Init = true - s.NegTokenInit = v - s.NegTokenInit.settings = s.settings - case NegTokenResp: - s.Resp = true - s.NegTokenResp = v - s.NegTokenResp.settings = s.settings - default: - return errors.New("unknown choice type for NegotiationToken") - } - return nil -} - -// Verify the SPNEGOToken -func (s *SPNEGOToken) Verify() (bool, gssapi.Status) { - if (!s.Init && !s.Resp) || (s.Init && s.Resp) { - return false, gssapi.Status{Code: gssapi.StatusDefectiveToken, Message: "invalid SPNEGO token, unclear if NegTokenInit or NegTokenResp"} - } - if s.Init { - s.NegTokenInit.settings = s.settings - ok, status := s.NegTokenInit.Verify() - if ok { - s.context = s.NegTokenInit.Context() - } - return ok, status - } - if s.Resp { - s.NegTokenResp.settings = s.settings - ok, status := s.NegTokenResp.Verify() - if ok { - s.context = s.NegTokenResp.Context() - } - return ok, status - } - // should not be possible to get here - return false, gssapi.Status{Code: gssapi.StatusFailure, Message: "unable to verify SPNEGO token"} -} - -// Context returns the SPNEGO context which will contain any verify user identity information. -func (s *SPNEGOToken) Context() context.Context { - return s.context -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/Authenticator.go b/vendor/github.com/jcmturner/gokrb5/v8/types/Authenticator.go deleted file mode 100644 index 1fdba78..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/Authenticator.go +++ /dev/null @@ -1,81 +0,0 @@ -// Package types provides Kerberos 5 data types. -package types - -import ( - "crypto/rand" - "fmt" - "math" - "math/big" - "time" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/asn1tools" - "github.com/jcmturner/gokrb5/v8/iana" - "github.com/jcmturner/gokrb5/v8/iana/asnAppTag" -) - -// Authenticator - A record containing information that can be shown to have been recently generated using the session -// key known only by the client and server. -// https://tools.ietf.org/html/rfc4120#section-5.5.1 -type Authenticator struct { - AVNO int `asn1:"explicit,tag:0"` - CRealm string `asn1:"generalstring,explicit,tag:1"` - CName PrincipalName `asn1:"explicit,tag:2"` - Cksum Checksum `asn1:"explicit,optional,tag:3"` - Cusec int `asn1:"explicit,tag:4"` - CTime time.Time `asn1:"generalized,explicit,tag:5"` - SubKey EncryptionKey `asn1:"explicit,optional,tag:6"` - SeqNumber int64 `asn1:"explicit,optional,tag:7"` - AuthorizationData AuthorizationData `asn1:"explicit,optional,tag:8"` -} - -// NewAuthenticator creates a new Authenticator. -func NewAuthenticator(realm string, cname PrincipalName) (Authenticator, error) { - seq, err := rand.Int(rand.Reader, big.NewInt(math.MaxUint32)) - if err != nil { - return Authenticator{}, err - } - t := time.Now().UTC() - return Authenticator{ - AVNO: iana.PVNO, - CRealm: realm, - CName: cname, - Cksum: Checksum{}, - Cusec: int((t.UnixNano() / int64(time.Microsecond)) - (t.Unix() * 1e6)), - CTime: t, - SeqNumber: seq.Int64(), - }, nil -} - -// GenerateSeqNumberAndSubKey sets the Authenticator's sequence number and subkey. -func (a *Authenticator) GenerateSeqNumberAndSubKey(keyType int32, keySize int) error { - seq, err := rand.Int(rand.Reader, big.NewInt(math.MaxUint32)) - if err != nil { - return err - } - a.SeqNumber = seq.Int64() - //Generate subkey value - sk := make([]byte, keySize, keySize) - rand.Read(sk) - a.SubKey = EncryptionKey{ - KeyType: keyType, - KeyValue: sk, - } - return nil -} - -// Unmarshal bytes into the Authenticator. -func (a *Authenticator) Unmarshal(b []byte) error { - _, err := asn1.UnmarshalWithParams(b, a, fmt.Sprintf("application,explicit,tag:%v", asnAppTag.Authenticator)) - return err -} - -// Marshal the Authenticator. -func (a *Authenticator) Marshal() ([]byte, error) { - b, err := asn1.Marshal(*a) - if err != nil { - return nil, err - } - b = asn1tools.AddASNAppTag(b, asnAppTag.Authenticator) - return b, nil -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/AuthorizationData.go b/vendor/github.com/jcmturner/gokrb5/v8/types/AuthorizationData.go deleted file mode 100644 index 80c477c..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/AuthorizationData.go +++ /dev/null @@ -1,55 +0,0 @@ -package types - -import ( - "github.com/jcmturner/gofork/encoding/asn1" -) - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.2.6 - -// AuthorizationData implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6 -type AuthorizationData []AuthorizationDataEntry - -// AuthorizationDataEntry implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6 -type AuthorizationDataEntry struct { - ADType int32 `asn1:"explicit,tag:0"` - ADData []byte `asn1:"explicit,tag:1"` -} - -// ADIfRelevant implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6.1 -type ADIfRelevant AuthorizationData - -// ADKDCIssued implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6.2 -type ADKDCIssued struct { - ADChecksum Checksum `asn1:"explicit,tag:0"` - IRealm string `asn1:"optional,generalstring,explicit,tag:1"` - Isname PrincipalName `asn1:"optional,explicit,tag:2"` - Elements AuthorizationData `asn1:"explicit,tag:3"` -} - -// ADAndOr implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6.3 -type ADAndOr struct { - ConditionCount int32 `asn1:"explicit,tag:0"` - Elements AuthorizationData `asn1:"explicit,tag:1"` -} - -// ADMandatoryForKDC implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.6.4 -type ADMandatoryForKDC AuthorizationData - -// Unmarshal bytes into the ADKDCIssued. -func (a *ADKDCIssued) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} - -// Unmarshal bytes into the AuthorizationData. -func (a *AuthorizationData) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} - -// Unmarshal bytes into the AuthorizationDataEntry. -func (a *AuthorizationDataEntry) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/Cryptosystem.go b/vendor/github.com/jcmturner/gokrb5/v8/types/Cryptosystem.go deleted file mode 100644 index 1f62d88..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/Cryptosystem.go +++ /dev/null @@ -1,55 +0,0 @@ -package types - -import ( - "github.com/jcmturner/gofork/encoding/asn1" -) - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.2.9 - -// EncryptedData implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.9 -type EncryptedData struct { - EType int32 `asn1:"explicit,tag:0"` - KVNO int `asn1:"explicit,optional,tag:1"` - Cipher []byte `asn1:"explicit,tag:2"` -} - -// EncryptionKey implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.9 -// AKA KeyBlock -type EncryptionKey struct { - KeyType int32 `asn1:"explicit,tag:0"` - KeyValue []byte `asn1:"explicit,tag:1" json:"-"` -} - -// Checksum implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.9 -type Checksum struct { - CksumType int32 `asn1:"explicit,tag:0"` - Checksum []byte `asn1:"explicit,tag:1"` -} - -// Unmarshal bytes into the EncryptedData. -func (a *EncryptedData) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} - -// Marshal the EncryptedData. -func (a *EncryptedData) Marshal() ([]byte, error) { - edb, err := asn1.Marshal(*a) - if err != nil { - return edb, err - } - return edb, nil -} - -// Unmarshal bytes into the EncryptionKey. -func (a *EncryptionKey) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} - -// Unmarshal bytes into the Checksum. -func (a *Checksum) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/HostAddress.go b/vendor/github.com/jcmturner/gokrb5/v8/types/HostAddress.go deleted file mode 100644 index 895fe80..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/HostAddress.go +++ /dev/null @@ -1,180 +0,0 @@ -package types - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.2.5 - -import ( - "bytes" - "fmt" - "net" - - "github.com/jcmturner/gofork/encoding/asn1" - "github.com/jcmturner/gokrb5/v8/iana/addrtype" -) - -// HostAddresses implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.5 -type HostAddresses []HostAddress - -// HostAddress implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.2.5 -type HostAddress struct { - AddrType int32 `asn1:"explicit,tag:0"` - Address []byte `asn1:"explicit,tag:1"` -} - -// GetHostAddress returns a HostAddress struct from a string in the format : -func GetHostAddress(s string) (HostAddress, error) { - var h HostAddress - cAddr, _, err := net.SplitHostPort(s) - if err != nil { - return h, fmt.Errorf("invalid format of client address: %v", err) - } - ip := net.ParseIP(cAddr) - var ht int32 - if ip.To4() != nil { - ht = addrtype.IPv4 - ip = ip.To4() - } else if ip.To16() != nil { - ht = addrtype.IPv6 - ip = ip.To16() - } else { - return h, fmt.Errorf("could not determine client's address types: %v", err) - } - h = HostAddress{ - AddrType: ht, - Address: ip, - } - return h, nil -} - -// GetAddress returns a string representation of the HostAddress. -func (h *HostAddress) GetAddress() (string, error) { - var b []byte - _, err := asn1.Unmarshal(h.Address, &b) - return string(b), err -} - -// LocalHostAddresses returns a HostAddresses struct for the local machines interface IP addresses. -func LocalHostAddresses() (ha HostAddresses, err error) { - ifs, err := net.Interfaces() - if err != nil { - return - } - for _, iface := range ifs { - if iface.Flags&net.FlagLoopback != 0 || iface.Flags&net.FlagUp == 0 { - // Interface is either loopback of not up - continue - } - addrs, err := iface.Addrs() - if err != nil { - continue - } - for _, addr := range addrs { - var ip net.IP - switch v := addr.(type) { - case *net.IPNet: - ip = v.IP - case *net.IPAddr: - ip = v.IP - } - var a HostAddress - if ip.To16() == nil { - //neither IPv4 or IPv6 - continue - } - if ip.To4() != nil { - //Is IPv4 - a.AddrType = addrtype.IPv4 - a.Address = ip.To4() - } else { - a.AddrType = addrtype.IPv6 - a.Address = ip.To16() - } - ha = append(ha, a) - } - } - return ha, nil -} - -// HostAddressesFromNetIPs returns a HostAddresses type from a slice of net.IP -func HostAddressesFromNetIPs(ips []net.IP) (ha HostAddresses) { - for _, ip := range ips { - ha = append(ha, HostAddressFromNetIP(ip)) - } - return ha -} - -// HostAddressFromNetIP returns a HostAddress type from a net.IP -func HostAddressFromNetIP(ip net.IP) HostAddress { - if ip.To4() != nil { - //Is IPv4 - return HostAddress{ - AddrType: addrtype.IPv4, - Address: ip.To4(), - } - } - return HostAddress{ - AddrType: addrtype.IPv6, - Address: ip.To16(), - } -} - -// HostAddressesEqual tests if two HostAddress slices are equal. -func HostAddressesEqual(h, a []HostAddress) bool { - if len(h) != len(a) { - return false - } - for _, e := range a { - var found bool - for _, i := range h { - if e.Equal(i) { - found = true - break - } - } - if !found { - return false - } - } - return true -} - -// HostAddressesContains tests if a HostAddress is contained in a HostAddress slice. -func HostAddressesContains(h []HostAddress, a HostAddress) bool { - for _, e := range h { - if e.Equal(a) { - return true - } - } - return false -} - -// Equal tests if the HostAddress is equal to another HostAddress provided. -func (h *HostAddress) Equal(a HostAddress) bool { - if h.AddrType != a.AddrType { - return false - } - return bytes.Equal(h.Address, a.Address) -} - -// Contains tests if a HostAddress is contained within the HostAddresses struct. -func (h *HostAddresses) Contains(a HostAddress) bool { - for _, e := range *h { - if e.Equal(a) { - return true - } - } - return false -} - -// Equal tests if a HostAddress slice is equal to the HostAddresses struct. -func (h *HostAddresses) Equal(a []HostAddress) bool { - if len(*h) != len(a) { - return false - } - for _, e := range a { - if !h.Contains(e) { - return false - } - } - return true -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/KerberosFlags.go b/vendor/github.com/jcmturner/gokrb5/v8/types/KerberosFlags.go deleted file mode 100644 index 0f20383..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/KerberosFlags.go +++ /dev/null @@ -1,68 +0,0 @@ -package types - -// Reference: https://www.ietf.org/rfc/rfc4120.txt -// Section: 5.2.8 - -import ( - "github.com/jcmturner/gofork/encoding/asn1" -) - -// NewKrbFlags returns an ASN1 BitString struct of the right size for KrbFlags. -func NewKrbFlags() asn1.BitString { - f := asn1.BitString{} - f.Bytes = make([]byte, 4) - f.BitLength = len(f.Bytes) * 8 - return f -} - -// SetFlags sets the flags of an ASN1 BitString. -func SetFlags(f *asn1.BitString, j []int) { - for _, i := range j { - SetFlag(f, i) - } -} - -// SetFlag sets a flag in an ASN1 BitString. -func SetFlag(f *asn1.BitString, i int) { - for l := len(f.Bytes); l < 4; l++ { - (*f).Bytes = append((*f).Bytes, byte(0)) - (*f).BitLength = len((*f).Bytes) * 8 - } - //Which byte? - b := i / 8 - //Which bit in byte - p := uint(7 - (i - 8*b)) - (*f).Bytes[b] = (*f).Bytes[b] | (1 << p) -} - -// UnsetFlags unsets flags in an ASN1 BitString. -func UnsetFlags(f *asn1.BitString, j []int) { - for _, i := range j { - UnsetFlag(f, i) - } -} - -// UnsetFlag unsets a flag in an ASN1 BitString. -func UnsetFlag(f *asn1.BitString, i int) { - for l := len(f.Bytes); l < 4; l++ { - (*f).Bytes = append((*f).Bytes, byte(0)) - (*f).BitLength = len((*f).Bytes) * 8 - } - //Which byte? - b := i / 8 - //Which bit in byte - p := uint(7 - (i - 8*b)) - (*f).Bytes[b] = (*f).Bytes[b] &^ (1 << p) -} - -// IsFlagSet tests if a flag is set in the ASN1 BitString. -func IsFlagSet(f *asn1.BitString, i int) bool { - //Which byte? - b := i / 8 - //Which bit in byte - p := uint(7 - (i - 8*b)) - if (*f).Bytes[b]&(1</@ -// a PrincipalName type will be returned with the name type set to KRB_NT_PRINCIPAL(1) -// and the realm will be returned as a string. If the "@" suffix -// is not included in the SPN then the value of realm string returned will be "" -func ParseSPNString(spn string) (pn PrincipalName, realm string) { - if strings.Contains(spn, "@") { - s := strings.Split(spn, "@") - realm = s[len(s)-1] - spn = strings.TrimSuffix(spn, "@"+realm) - } - pn = NewPrincipalName(nametype.KRB_NT_PRINCIPAL, spn) - return -} diff --git a/vendor/github.com/jcmturner/gokrb5/v8/types/TypedData.go b/vendor/github.com/jcmturner/gokrb5/v8/types/TypedData.go deleted file mode 100644 index 19e9f49..0000000 --- a/vendor/github.com/jcmturner/gokrb5/v8/types/TypedData.go +++ /dev/null @@ -1,18 +0,0 @@ -package types - -import "github.com/jcmturner/gofork/encoding/asn1" - -// TypedData implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.9.1 -type TypedData struct { - DataType int32 `asn1:"explicit,tag:0"` - DataValue []byte `asn1:"optional,explicit,tag:1"` -} - -// TypedDataSequence implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.9.1 -type TypedDataSequence []TypedData - -// Unmarshal bytes into the TypedDataSequence. -func (a *TypedDataSequence) Unmarshal(b []byte) error { - _, err := asn1.Unmarshal(b, a) - return err -} diff --git a/vendor/github.com/jcmturner/rpc/v2/LICENSE b/vendor/github.com/jcmturner/rpc/v2/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/claims.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/claims.go deleted file mode 100644 index b9f535f..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/claims.go +++ /dev/null @@ -1,152 +0,0 @@ -package mstypes - -import ( - "bytes" - "encoding/hex" - "errors" - "fmt" - - "github.com/jcmturner/rpc/v2/ndr" - "golang.org/x/net/http2/hpack" -) - -// Compression format assigned numbers. https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-xca/a8b7cb0a-92a6-4187-a23b-5e14273b96f8 -const ( - CompressionFormatNone uint16 = 0 - CompressionFormatLZNT1 uint16 = 2 // LZNT1 aka ntfs compression - CompressionFormatXPress uint16 = 3 // plain LZ77 - CompressionFormatXPressHuff uint16 = 4 // LZ77+Huffman - The Huffman variant of the XPRESS compression format uses LZ77-style dictionary compression combined with Huffman coding. -) - -// ClaimsSourceTypeAD https://msdn.microsoft.com/en-us/library/hh553809.aspx -const ClaimsSourceTypeAD uint16 = 1 - -// Claim Type assigned numbers -const ( - ClaimTypeIDInt64 uint16 = 1 - ClaimTypeIDUInt64 uint16 = 2 - ClaimTypeIDString uint16 = 3 - ClaimsTypeIDBoolean uint16 = 6 -) - -// ClaimsBlob implements https://msdn.microsoft.com/en-us/library/hh554119.aspx -type ClaimsBlob struct { - Size uint32 - EncodedBlob EncodedBlob -} - -// EncodedBlob are the bytes of the encoded Claims -type EncodedBlob []byte - -// Size returns the size of the bytes of the encoded Claims -func (b EncodedBlob) Size(c interface{}) int { - cb := c.(ClaimsBlob) - return int(cb.Size) -} - -// ClaimsSetMetadata implements https://msdn.microsoft.com/en-us/library/hh554073.aspx -type ClaimsSetMetadata struct { - ClaimsSetSize uint32 - ClaimsSetBytes []byte `ndr:"pointer,conformant"` - CompressionFormat uint16 // Enum see constants for options - UncompressedClaimsSetSize uint32 - ReservedType uint16 - ReservedFieldSize uint32 - ReservedField []byte `ndr:"pointer,conformant"` -} - -// ClaimsSet reads the ClaimsSet type from the NDR encoded ClaimsSetBytes in the ClaimsSetMetadata -func (m *ClaimsSetMetadata) ClaimsSet() (c ClaimsSet, err error) { - if len(m.ClaimsSetBytes) < 1 { - err = errors.New("no bytes available for ClaimsSet") - return - } - // TODO switch statement to decompress ClaimsSetBytes - switch m.CompressionFormat { - case CompressionFormatLZNT1: - s := hex.EncodeToString(m.ClaimsSetBytes) - err = fmt.Errorf("ClaimsSet compressed, format LZNT1 not currently supported: %s", s) - return - case CompressionFormatXPress: - s := hex.EncodeToString(m.ClaimsSetBytes) - err = fmt.Errorf("ClaimsSet compressed, format XPress not currently supported: %s", s) - return - case CompressionFormatXPressHuff: - var b []byte - buff := bytes.NewBuffer(b) - _, e := hpack.HuffmanDecode(buff, m.ClaimsSetBytes) - if e != nil { - err = fmt.Errorf("error deflating: %v", e) - return - } - m.ClaimsSetBytes = buff.Bytes() - } - dec := ndr.NewDecoder(bytes.NewReader(m.ClaimsSetBytes)) - err = dec.Decode(&c) - return -} - -// ClaimsSet implements https://msdn.microsoft.com/en-us/library/hh554122.aspx -type ClaimsSet struct { - ClaimsArrayCount uint32 - ClaimsArrays []ClaimsArray `ndr:"pointer,conformant"` - ReservedType uint16 - ReservedFieldSize uint32 - ReservedField []byte `ndr:"pointer,conformant"` -} - -// ClaimsArray implements https://msdn.microsoft.com/en-us/library/hh536458.aspx -type ClaimsArray struct { - ClaimsSourceType uint16 - ClaimsCount uint32 - ClaimEntries []ClaimEntry `ndr:"pointer,conformant"` -} - -// ClaimEntry is a NDR union that implements https://msdn.microsoft.com/en-us/library/hh536374.aspx -type ClaimEntry struct { - ID string `ndr:"pointer,conformant,varying"` - Type uint16 `ndr:"unionTag"` - TypeInt64 ClaimTypeInt64 `ndr:"unionField"` - TypeUInt64 ClaimTypeUInt64 `ndr:"unionField"` - TypeString ClaimTypeString `ndr:"unionField"` - TypeBool ClaimTypeBoolean `ndr:"unionField"` -} - -// SwitchFunc is the ClaimEntry union field selection function -func (u ClaimEntry) SwitchFunc(_ interface{}) string { - switch u.Type { - case ClaimTypeIDInt64: - return "TypeInt64" - case ClaimTypeIDUInt64: - return "TypeUInt64" - case ClaimTypeIDString: - return "TypeString" - case ClaimsTypeIDBoolean: - return "TypeBool" - } - return "" -} - -// ClaimTypeInt64 is a claim of type int64 -type ClaimTypeInt64 struct { - ValueCount uint32 - Value []int64 `ndr:"pointer,conformant"` -} - -// ClaimTypeUInt64 is a claim of type uint64 -type ClaimTypeUInt64 struct { - ValueCount uint32 - Value []uint64 `ndr:"pointer,conformant"` -} - -// ClaimTypeString is a claim of type string -type ClaimTypeString struct { - ValueCount uint32 - Value []LPWSTR `ndr:"pointer,conformant"` -} - -// ClaimTypeBoolean is a claim of type bool -type ClaimTypeBoolean struct { - ValueCount uint32 - Value []bool `ndr:"pointer,conformant"` -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/common.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/common.go deleted file mode 100644 index fb6510d..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/common.go +++ /dev/null @@ -1,12 +0,0 @@ -// Package mstypes provides implemnations of some Microsoft data types [MS-DTYP] https://msdn.microsoft.com/en-us/library/cc230283.aspx -package mstypes - -// LPWSTR implements https://msdn.microsoft.com/en-us/library/cc230355.aspx -type LPWSTR struct { - Value string `ndr:"pointer,conformant,varying"` -} - -// String returns the string representation of LPWSTR data type. -func (s *LPWSTR) String() string { - return s.Value -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/filetime.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/filetime.go deleted file mode 100644 index 5cc952f..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/filetime.go +++ /dev/null @@ -1,52 +0,0 @@ -// Package mstypes implements representations of Microsoft types -package mstypes - -import ( - "time" -) - -/* -FILETIME is a windows data structure. -Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724284%28v=vs.85%29.aspx -It contains two parts that are 32bit integers: - dwLowDateTime - dwHighDateTime -We need to combine these two into one 64bit integer. -This gives the number of 100 nano second period from January 1, 1601, Coordinated Universal Time (UTC) -*/ - -const unixEpochDiff = 116444736000000000 - -// FileTime implements the Microsoft FILETIME type https://msdn.microsoft.com/en-us/library/cc230324.aspx -type FileTime struct { - LowDateTime uint32 - HighDateTime uint32 -} - -// Time return a golang Time type from the FileTime -func (ft FileTime) Time() time.Time { - ns := (ft.MSEpoch() - unixEpochDiff) * 100 - return time.Unix(0, int64(ns)).UTC() -} - -// MSEpoch returns the FileTime as a Microsoft epoch, the number of 100 nano second periods elapsed from January 1, 1601 UTC. -func (ft FileTime) MSEpoch() int64 { - return (int64(ft.HighDateTime) << 32) + int64(ft.LowDateTime) -} - -// Unix returns the FileTime as a Unix time, the number of seconds elapsed since January 1, 1970 UTC. -func (ft FileTime) Unix() int64 { - return (ft.MSEpoch() - unixEpochDiff) / 10000000 -} - -// GetFileTime returns a FileTime type from the provided Golang Time type. -func GetFileTime(t time.Time) FileTime { - ns := t.UnixNano() - fp := (ns / 100) + unixEpochDiff - hd := fp >> 32 - ld := fp - (hd << 32) - return FileTime{ - LowDateTime: uint32(ld), - HighDateTime: uint32(hd), - } -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/group_membership.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/group_membership.go deleted file mode 100644 index 7915137..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/group_membership.go +++ /dev/null @@ -1,19 +0,0 @@ -package mstypes - -// GroupMembership implements https://msdn.microsoft.com/en-us/library/cc237945.aspx -// RelativeID : A 32-bit unsigned integer that contains the RID of a particular group. -// The possible values for the Attributes flags are identical to those specified in KERB_SID_AND_ATTRIBUTES -type GroupMembership struct { - RelativeID uint32 - Attributes uint32 -} - -// DomainGroupMembership implements https://msdn.microsoft.com/en-us/library/hh536344.aspx -// DomainId: A SID structure that contains the SID for the domain.This member is used in conjunction with the GroupIds members to create group SIDs for the device. -// GroupCount: A 32-bit unsigned integer that contains the number of groups within the domain to which the account belongs. -// GroupIds: A pointer to a list of GROUP_MEMBERSHIP structures that contain the groups to which the account belongs in the domain. The number of groups in this list MUST be equal to GroupCount. -type DomainGroupMembership struct { - DomainID RPCSID `ndr:"pointer"` - GroupCount uint32 - GroupIDs []GroupMembership `ndr:"pointer,conformant"` // Size is value of GroupCount -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/kerb_sid_and_attributes.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/kerb_sid_and_attributes.go deleted file mode 100644 index 61ac39b..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/kerb_sid_and_attributes.go +++ /dev/null @@ -1,23 +0,0 @@ -package mstypes - -// Attributes of a security group membership and can be combined by using the bitwise OR operation. -// They are used by an access check mechanism to specify whether the membership is to be used in an access check decision. -const ( - SEGroupMandatory = 31 - SEGroupEnabledByDefault = 30 - SEGroupEnabled = 29 - SEGroupOwner = 28 - SEGroupResource = 2 - //All other bits MUST be set to zero and MUST be ignored on receipt. -) - -// KerbSidAndAttributes implements https://msdn.microsoft.com/en-us/library/cc237947.aspx -type KerbSidAndAttributes struct { - SID RPCSID `ndr:"pointer"` // A pointer to an RPC_SID structure. - Attributes uint32 -} - -// SetFlag sets a flag in a uint32 attribute value. -func SetFlag(a *uint32, i uint) { - *a = *a | (1 << (31 - i)) -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/reader.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/reader.go deleted file mode 100644 index 24495bc..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/reader.go +++ /dev/null @@ -1,109 +0,0 @@ -package mstypes - -import ( - "bufio" - "encoding/binary" - "fmt" - "io" -) - -// Byte sizes of primitive types -const ( - SizeBool = 1 - SizeChar = 1 - SizeUint8 = 1 - SizeUint16 = 2 - SizeUint32 = 4 - SizeUint64 = 8 - SizeEnum = 2 - SizeSingle = 4 - SizeDouble = 8 - SizePtr = 4 -) - -// Reader reads simple byte stream data into a Go representations -type Reader struct { - r *bufio.Reader // source of the data -} - -// NewReader creates a new instance of a simple Reader. -func NewReader(r io.Reader) *Reader { - reader := new(Reader) - reader.r = bufio.NewReader(r) - return reader -} - -func (r *Reader) Read(p []byte) (n int, err error) { - return r.r.Read(p) -} - -func (r *Reader) Uint8() (uint8, error) { - b, err := r.r.ReadByte() - if err != nil { - return uint8(0), err - } - return uint8(b), nil -} - -func (r *Reader) Uint16() (uint16, error) { - b, err := r.ReadBytes(SizeUint16) - if err != nil { - return uint16(0), err - } - return binary.LittleEndian.Uint16(b), nil -} - -func (r *Reader) Uint32() (uint32, error) { - b, err := r.ReadBytes(SizeUint32) - if err != nil { - return uint32(0), err - } - return binary.LittleEndian.Uint32(b), nil -} - -func (r *Reader) Uint64() (uint64, error) { - b, err := r.ReadBytes(SizeUint64) - if err != nil { - return uint64(0), err - } - return binary.LittleEndian.Uint64(b), nil -} - -func (r *Reader) FileTime() (f FileTime, err error) { - f.LowDateTime, err = r.Uint32() - if err != nil { - return - } - f.HighDateTime, err = r.Uint32() - if err != nil { - return - } - return -} - -// UTF16String returns a string that is UTF16 encoded in a byte slice. n is the number of bytes representing the string -func (r *Reader) UTF16String(n int) (str string, err error) { - //Length divided by 2 as each run is 16bits = 2bytes - s := make([]rune, n/2, n/2) - for i := 0; i < len(s); i++ { - var u uint16 - u, err = r.Uint16() - if err != nil { - return - } - s[i] = rune(u) - } - str = string(s) - return -} - -// readBytes returns a number of bytes from the NDR byte stream. -func (r *Reader) ReadBytes(n int) ([]byte, error) { - //TODO make this take an int64 as input to allow for larger values on all systems? - b := make([]byte, n, n) - m, err := r.r.Read(b) - if err != nil || m != n { - return b, fmt.Errorf("error reading bytes from stream: %v", err) - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/rpc_unicode_string.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/rpc_unicode_string.go deleted file mode 100644 index 4bf02e0..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/rpc_unicode_string.go +++ /dev/null @@ -1,13 +0,0 @@ -package mstypes - -// RPCUnicodeString implements https://msdn.microsoft.com/en-us/library/cc230365.aspx -type RPCUnicodeString struct { - Length uint16 // The length, in bytes, of the string pointed to by the Buffer member, not including the terminating null character if any. The length MUST be a multiple of 2. The length SHOULD equal the entire size of the Buffer, in which case there is no terminating null character. Any method that accesses this structure MUST use the Length specified instead of relying on the presence or absence of a null character. - MaximumLength uint16 // The maximum size, in bytes, of the string pointed to by Buffer. The size MUST be a multiple of 2. If not, the size MUST be decremented by 1 prior to use. This value MUST not be less than Length. - Value string `ndr:"pointer,conformant,varying"` -} - -// String returns the RPCUnicodeString string value -func (r *RPCUnicodeString) String() string { - return r.Value -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/sid.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/sid.go deleted file mode 100644 index 98a9c5a..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/sid.go +++ /dev/null @@ -1,32 +0,0 @@ -package mstypes - -import ( - "encoding/binary" - "encoding/hex" - "fmt" -) - -// RPCSID implements https://msdn.microsoft.com/en-us/library/cc230364.aspx -type RPCSID struct { - Revision uint8 // An 8-bit unsigned integer that specifies the revision level of the SID. This value MUST be set to 0x01. - SubAuthorityCount uint8 // An 8-bit unsigned integer that specifies the number of elements in the SubAuthority array. The maximum number of elements allowed is 15. - IdentifierAuthority [6]byte // An RPC_SID_IDENTIFIER_AUTHORITY structure that indicates the authority under which the SID was created. It describes the entity that created the SID. The Identifier Authority value {0,0,0,0,0,5} denotes SIDs created by the NT SID authority. - SubAuthority []uint32 `ndr:"conformant"` // A variable length array of unsigned 32-bit integers that uniquely identifies a principal relative to the IdentifierAuthority. Its length is determined by SubAuthorityCount. -} - -// String returns the string representation of the RPC_SID. -func (s *RPCSID) String() string { - var str string - b := append(make([]byte, 2, 2), s.IdentifierAuthority[:]...) - // For a strange reason this is read big endian: https://msdn.microsoft.com/en-us/library/dd302645.aspx - i := binary.BigEndian.Uint64(b) - if i >= 4294967296 { - str = fmt.Sprintf("S-1-0x%s", hex.EncodeToString(s.IdentifierAuthority[:])) - } else { - str = fmt.Sprintf("S-1-%d", i) - } - for _, sub := range s.SubAuthority { - str = fmt.Sprintf("%s-%d", str, sub) - } - return str -} diff --git a/vendor/github.com/jcmturner/rpc/v2/mstypes/user_session_key.go b/vendor/github.com/jcmturner/rpc/v2/mstypes/user_session_key.go deleted file mode 100644 index fcf0a5d..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/mstypes/user_session_key.go +++ /dev/null @@ -1,11 +0,0 @@ -package mstypes - -// CypherBlock implements https://msdn.microsoft.com/en-us/library/cc237040.aspx -type CypherBlock struct { - Data [8]byte // size = 8 -} - -// UserSessionKey implements https://msdn.microsoft.com/en-us/library/cc237080.aspx -type UserSessionKey struct { - CypherBlock [2]CypherBlock // size = 2 -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/arrays.go b/vendor/github.com/jcmturner/rpc/v2/ndr/arrays.go deleted file mode 100644 index 5e2def2..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/arrays.go +++ /dev/null @@ -1,413 +0,0 @@ -package ndr - -import ( - "errors" - "fmt" - "reflect" - "strconv" -) - -// intFromTag returns an int that is a value in a struct tag key/value pair -func intFromTag(tag reflect.StructTag, key string) (int, error) { - ndrTag := parseTags(tag) - d := 1 - if n, ok := ndrTag.Map[key]; ok { - i, err := strconv.Atoi(n) - if err != nil { - return d, fmt.Errorf("invalid dimensions tag [%s]: %v", n, err) - } - d = i - } - return d, nil -} - -// parseDimensions returns the a slice of the size of each dimension and type of the member at the deepest level. -func parseDimensions(v reflect.Value) (l []int, tb reflect.Type) { - if v.Kind() == reflect.Ptr { - v = v.Elem() - } - t := v.Type() - if t.Kind() == reflect.Ptr { - t = t.Elem() - } - if t.Kind() != reflect.Array && t.Kind() != reflect.Slice { - return - } - l = append(l, v.Len()) - if t.Elem().Kind() == reflect.Array || t.Elem().Kind() == reflect.Slice { - // contains array or slice - var m []int - m, tb = parseDimensions(v.Index(0)) - l = append(l, m...) - } else { - tb = t.Elem() - } - return -} - -// sliceDimensions returns the count of dimensions a slice has. -func sliceDimensions(t reflect.Type) (d int, tb reflect.Type) { - if t.Kind() == reflect.Ptr { - t = t.Elem() - } - if t.Kind() == reflect.Slice { - d++ - var n int - n, tb = sliceDimensions(t.Elem()) - d += n - } else { - tb = t - } - return -} - -// makeSubSlices is a deep recursive creation/initialisation of multi-dimensional slices. -// Takes the reflect.Value of the 1st dimension and a slice of the lengths of the sub dimensions -func makeSubSlices(v reflect.Value, l []int) { - ty := v.Type().Elem() - if ty.Kind() != reflect.Slice { - return - } - for i := 0; i < v.Len(); i++ { - s := reflect.MakeSlice(ty, l[0], l[0]) - v.Index(i).Set(s) - // Are there more sub dimensions? - if len(l) > 1 { - makeSubSlices(v.Index(i), l[1:]) - } - } - return -} - -// multiDimensionalIndexPermutations returns all the permutations of the indexes of a multi-dimensional slice. -// The input is a slice of integers that indicates the max size/length of each dimension -func multiDimensionalIndexPermutations(l []int) (ps [][]int) { - z := make([]int, len(l), len(l)) // The zeros permutation - ps = append(ps, z) - // for each dimension, in reverse - for i := len(l) - 1; i >= 0; i-- { - ws := make([][]int, len(ps)) - copy(ws, ps) - //create a permutation for each of the iterations of the current dimension - for j := 1; j <= l[i]-1; j++ { - // For each existing permutation - for _, p := range ws { - np := make([]int, len(p), len(p)) - copy(np, p) - np[i] = j - ps = append(ps, np) - } - } - } - return -} - -// precedingMax reads off the next conformant max value -func (dec *Decoder) precedingMax() uint32 { - m := dec.conformantMax[0] - dec.conformantMax = dec.conformantMax[1:] - return m -} - -// fillFixedArray establishes if the fixed array is uni or multi dimensional and then fills it. -func (dec *Decoder) fillFixedArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - l, t := parseDimensions(v) - if t.Kind() == reflect.String { - tag = reflect.StructTag(subStringArrayTag) - } - if len(l) < 1 { - return errors.New("could not establish dimensions of fixed array") - } - if len(l) == 1 { - err := dec.fillUniDimensionalFixedArray(v, tag, def) - if err != nil { - return fmt.Errorf("could not fill uni-dimensional fixed array: %v", err) - } - return nil - } - // Fixed array is multidimensional - ps := multiDimensionalIndexPermutations(l[:len(l)-1]) - for _, p := range ps { - // Get current multi-dimensional index to fill - a := v - for _, i := range p { - a = a.Index(i) - } - // fill with the last dimension array - err := dec.fillUniDimensionalFixedArray(a, tag, def) - if err != nil { - return fmt.Errorf("could not fill dimension %v of multi-dimensional fixed array: %v", p, err) - } - } - return nil -} - -// readUniDimensionalFixedArray reads an array (not slice) from the byte stream. -func (dec *Decoder) fillUniDimensionalFixedArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - for i := 0; i < v.Len(); i++ { - err := dec.fill(v.Index(i), tag, def) - if err != nil { - return fmt.Errorf("could not fill index %d of fixed array: %v", i, err) - } - } - return nil -} - -// fillConformantArray establishes if the conformant array is uni or multi dimensional and then fills the slice. -func (dec *Decoder) fillConformantArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - d, _ := sliceDimensions(v.Type()) - if d > 1 { - err := dec.fillMultiDimensionalConformantArray(v, d, tag, def) - if err != nil { - return err - } - } else { - err := dec.fillUniDimensionalConformantArray(v, tag, def) - if err != nil { - return err - } - } - return nil -} - -// fillUniDimensionalConformantArray fills the uni-dimensional slice value. -func (dec *Decoder) fillUniDimensionalConformantArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - m := dec.precedingMax() - n := int(m) - a := reflect.MakeSlice(v.Type(), n, n) - for i := 0; i < n; i++ { - err := dec.fill(a.Index(i), tag, def) - if err != nil { - return fmt.Errorf("could not fill index %d of uni-dimensional conformant array: %v", i, err) - } - } - v.Set(a) - return nil -} - -// fillMultiDimensionalConformantArray fills the multi-dimensional slice value provided from conformant array data. -// The number of dimensions must be specified. This must be less than or equal to the dimensions in the slice for this -// method not to panic. -func (dec *Decoder) fillMultiDimensionalConformantArray(v reflect.Value, d int, tag reflect.StructTag, def *[]deferedPtr) error { - // Read the max size of each dimensions from the ndr stream - l := make([]int, d, d) - for i := range l { - l[i] = int(dec.precedingMax()) - } - // Initialise size of slices - // Initialise the size of the 1st dimension - ty := v.Type() - v.Set(reflect.MakeSlice(ty, l[0], l[0])) - // Initialise the size of the other dimensions recursively - makeSubSlices(v, l[1:]) - - // Get all permutations of the indexes and go through each and fill - ps := multiDimensionalIndexPermutations(l) - for _, p := range ps { - // Get current multi-dimensional index to fill - a := v - for _, i := range p { - a = a.Index(i) - } - err := dec.fill(a, tag, def) - if err != nil { - return fmt.Errorf("could not fill index %v of slice: %v", p, err) - } - } - return nil -} - -// fillVaryingArray establishes if the varying array is uni or multi dimensional and then fills the slice. -func (dec *Decoder) fillVaryingArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - d, t := sliceDimensions(v.Type()) - if d > 1 { - err := dec.fillMultiDimensionalVaryingArray(v, t, d, tag, def) - if err != nil { - return err - } - } else { - err := dec.fillUniDimensionalVaryingArray(v, tag, def) - if err != nil { - return err - } - } - return nil -} - -// fillUniDimensionalVaryingArray fills the uni-dimensional slice value. -func (dec *Decoder) fillUniDimensionalVaryingArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - o, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read offset of uni-dimensional varying array: %v", err) - } - s, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not establish actual count of uni-dimensional varying array: %v", err) - } - t := v.Type() - // Total size of the array is the offset in the index being passed plus the actual count of elements being passed. - n := int(s + o) - a := reflect.MakeSlice(t, n, n) - // Populate the array starting at the offset specified - for i := int(o); i < n; i++ { - err := dec.fill(a.Index(i), tag, def) - if err != nil { - return fmt.Errorf("could not fill index %d of uni-dimensional varying array: %v", i, err) - } - } - v.Set(a) - return nil -} - -// fillMultiDimensionalVaryingArray fills the multi-dimensional slice value provided from varying array data. -// The number of dimensions must be specified. This must be less than or equal to the dimensions in the slice for this -// method not to panic. -func (dec *Decoder) fillMultiDimensionalVaryingArray(v reflect.Value, t reflect.Type, d int, tag reflect.StructTag, def *[]deferedPtr) error { - // Read the offset and actual count of each dimensions from the ndr stream - o := make([]int, d, d) - l := make([]int, d, d) - for i := range l { - off, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read offset of dimension %d: %v", i+1, err) - } - o[i] = int(off) - s, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read size of dimension %d: %v", i+1, err) - } - l[i] = int(s) + int(off) - } - // Initialise size of slices - // Initialise the size of the 1st dimension - ty := v.Type() - v.Set(reflect.MakeSlice(ty, l[0], l[0])) - // Initialise the size of the other dimensions recursively - makeSubSlices(v, l[1:]) - - // Get all permutations of the indexes and go through each and fill - ps := multiDimensionalIndexPermutations(l) - for _, p := range ps { - // Get current multi-dimensional index to fill - a := v - var os bool // should this permutation be skipped due to the offset of any of the dimensions? - for i, j := range p { - if j < o[i] { - os = true - break - } - a = a.Index(j) - } - if os { - // This permutation should be skipped as it is less than the offset for one of the dimensions. - continue - } - err := dec.fill(a, tag, def) - if err != nil { - return fmt.Errorf("could not fill index %v of slice: %v", p, err) - } - } - return nil -} - -// fillConformantVaryingArray establishes if the varying array is uni or multi dimensional and then fills the slice. -func (dec *Decoder) fillConformantVaryingArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - d, t := sliceDimensions(v.Type()) - if d > 1 { - err := dec.fillMultiDimensionalConformantVaryingArray(v, t, d, tag, def) - if err != nil { - return err - } - } else { - err := dec.fillUniDimensionalConformantVaryingArray(v, tag, def) - if err != nil { - return err - } - } - return nil -} - -// fillUniDimensionalConformantVaryingArray fills the uni-dimensional slice value. -func (dec *Decoder) fillUniDimensionalConformantVaryingArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - m := dec.precedingMax() - o, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read offset of uni-dimensional conformant varying array: %v", err) - } - s, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not establish actual count of uni-dimensional conformant varying array: %v", err) - } - if m < o+s { - return errors.New("max count is less than the offset plus actual count") - } - t := v.Type() - n := int(s) - a := reflect.MakeSlice(t, n, n) - for i := int(o); i < n; i++ { - err := dec.fill(a.Index(i), tag, def) - if err != nil { - return fmt.Errorf("could not fill index %d of uni-dimensional conformant varying array: %v", i, err) - } - } - v.Set(a) - return nil -} - -// fillMultiDimensionalConformantVaryingArray fills the multi-dimensional slice value provided from conformant varying array data. -// The number of dimensions must be specified. This must be less than or equal to the dimensions in the slice for this -// method not to panic. -func (dec *Decoder) fillMultiDimensionalConformantVaryingArray(v reflect.Value, t reflect.Type, d int, tag reflect.StructTag, def *[]deferedPtr) error { - // Read the offset and actual count of each dimensions from the ndr stream - m := make([]int, d, d) - for i := range m { - m[i] = int(dec.precedingMax()) - } - o := make([]int, d, d) - l := make([]int, d, d) - for i := range l { - off, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read offset of dimension %d: %v", i+1, err) - } - o[i] = int(off) - s, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not read actual count of dimension %d: %v", i+1, err) - } - if m[i] < int(s)+int(off) { - m[i] = int(s) + int(off) - } - l[i] = int(s) - } - // Initialise size of slices - // Initialise the size of the 1st dimension - ty := v.Type() - v.Set(reflect.MakeSlice(ty, m[0], m[0])) - // Initialise the size of the other dimensions recursively - makeSubSlices(v, m[1:]) - - // Get all permutations of the indexes and go through each and fill - ps := multiDimensionalIndexPermutations(m) - for _, p := range ps { - // Get current multi-dimensional index to fill - a := v - var os bool // should this permutation be skipped due to the offset of any of the dimensions or max is higher than the actual count being passed - for i, j := range p { - if j < o[i] || j >= l[i] { - os = true - break - } - a = a.Index(j) - } - if os { - // This permutation should be skipped as it is less than the offset for one of the dimensions. - continue - } - err := dec.fill(a, tag, def) - if err != nil { - return fmt.Errorf("could not fill index %v of slice: %v", p, err) - } - } - return nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/decoder.go b/vendor/github.com/jcmturner/rpc/v2/ndr/decoder.go deleted file mode 100644 index 6157b4e..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/decoder.go +++ /dev/null @@ -1,393 +0,0 @@ -// Package ndr provides the ability to unmarshal NDR encoded byte steams into Go data structures -package ndr - -import ( - "bufio" - "fmt" - "io" - "reflect" - "strings" -) - -// Struct tag values -const ( - TagConformant = "conformant" - TagVarying = "varying" - TagPointer = "pointer" - TagPipe = "pipe" -) - -// Decoder unmarshals NDR byte stream data into a Go struct representation -type Decoder struct { - r *bufio.Reader // source of the data - size int // initial size of bytes in buffer - ch CommonHeader // NDR common header - ph PrivateHeader // NDR private header - conformantMax []uint32 // conformant max values that were moved to the beginning of the structure - s interface{} // pointer to the structure being populated - current []string // keeps track of the current field being populated -} - -type deferedPtr struct { - v reflect.Value - tag reflect.StructTag -} - -// NewDecoder creates a new instance of a NDR Decoder. -func NewDecoder(r io.Reader) *Decoder { - dec := new(Decoder) - dec.r = bufio.NewReader(r) - dec.r.Peek(int(commonHeaderBytes)) // For some reason an operation is needed on the buffer to initialise it so Buffered() != 0 - dec.size = dec.r.Buffered() - return dec -} - -// Decode unmarshals the NDR encoded bytes into the pointer of a struct provided. -func (dec *Decoder) Decode(s interface{}) error { - dec.s = s - err := dec.readCommonHeader() - if err != nil { - return err - } - err = dec.readPrivateHeader() - if err != nil { - return err - } - _, err = dec.r.Discard(4) //The next 4 bytes are an RPC unique pointer referent. We just skip these. - if err != nil { - return Errorf("unable to process byte stream: %v", err) - } - - return dec.process(s, reflect.StructTag("")) -} - -func (dec *Decoder) process(s interface{}, tag reflect.StructTag) error { - // Scan for conformant fields as their max counts are moved to the beginning - // http://pubs.opengroup.org/onlinepubs/9629399/chap14.htm#tagfcjh_37 - err := dec.scanConformantArrays(s, tag) - if err != nil { - return err - } - // Recursively fill the struct fields - var localDef []deferedPtr - err = dec.fill(s, tag, &localDef) - if err != nil { - return Errorf("could not decode: %v", err) - } - // Read any deferred referents associated with pointers - for _, p := range localDef { - err = dec.process(p.v, p.tag) - if err != nil { - return fmt.Errorf("could not decode deferred referent: %v", err) - } - } - return nil -} - -// scanConformantArrays scans the structure for embedded conformant fields and captures the maximum element counts for -// dimensions of the array that are moved to the beginning of the structure. -func (dec *Decoder) scanConformantArrays(s interface{}, tag reflect.StructTag) error { - err := dec.conformantScan(s, tag) - if err != nil { - return fmt.Errorf("failed to scan for embedded conformant arrays: %v", err) - } - for i := range dec.conformantMax { - dec.conformantMax[i], err = dec.readUint32() - if err != nil { - return fmt.Errorf("could not read preceding conformant max count index %d: %v", i, err) - } - } - return nil -} - -// conformantScan inspects the structure's fields for whether they are conformant. -func (dec *Decoder) conformantScan(s interface{}, tag reflect.StructTag) error { - ndrTag := parseTags(tag) - if ndrTag.HasValue(TagPointer) { - return nil - } - v := getReflectValue(s) - switch v.Kind() { - case reflect.Struct: - for i := 0; i < v.NumField(); i++ { - err := dec.conformantScan(v.Field(i), v.Type().Field(i).Tag) - if err != nil { - return err - } - } - case reflect.String: - if !ndrTag.HasValue(TagConformant) { - break - } - dec.conformantMax = append(dec.conformantMax, uint32(0)) - case reflect.Slice: - if !ndrTag.HasValue(TagConformant) { - break - } - d, t := sliceDimensions(v.Type()) - for i := 0; i < d; i++ { - dec.conformantMax = append(dec.conformantMax, uint32(0)) - } - // For string arrays there is a common max for the strings within the array. - if t.Kind() == reflect.String { - dec.conformantMax = append(dec.conformantMax, uint32(0)) - } - } - return nil -} - -func (dec *Decoder) isPointer(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) (bool, error) { - // Pointer so defer filling the referent - ndrTag := parseTags(tag) - if ndrTag.HasValue(TagPointer) { - p, err := dec.readUint32() - if err != nil { - return true, fmt.Errorf("could not read pointer: %v", err) - } - ndrTag.delete(TagPointer) - if p != 0 { - // if pointer is not zero add to the deferred items at end of stream - *def = append(*def, deferedPtr{v, ndrTag.StructTag()}) - } - return true, nil - } - return false, nil -} - -func getReflectValue(s interface{}) (v reflect.Value) { - if r, ok := s.(reflect.Value); ok { - v = r - } else { - if reflect.ValueOf(s).Kind() == reflect.Ptr { - v = reflect.ValueOf(s).Elem() - } - } - return -} - -// fill populates fields with values from the NDR byte stream. -func (dec *Decoder) fill(s interface{}, tag reflect.StructTag, localDef *[]deferedPtr) error { - v := getReflectValue(s) - - //// Pointer so defer filling the referent - ptr, err := dec.isPointer(v, tag, localDef) - if err != nil { - return fmt.Errorf("could not process struct field(%s): %v", strings.Join(dec.current, "/"), err) - } - if ptr { - return nil - } - - // Populate the value from the byte stream - switch v.Kind() { - case reflect.Struct: - dec.current = append(dec.current, v.Type().Name()) //Track the current field being filled - // in case struct is a union, track this and the selected union field for efficiency - var unionTag reflect.Value - var unionField string // field to fill if struct is a union - // Go through each field in the struct and recursively fill - for i := 0; i < v.NumField(); i++ { - fieldName := v.Type().Field(i).Name - dec.current = append(dec.current, fieldName) //Track the current field being filled - //fmt.Fprintf(os.Stderr, "DEBUG Decoding: %s\n", strings.Join(dec.current, "/")) - structTag := v.Type().Field(i).Tag - ndrTag := parseTags(structTag) - - // Union handling - if !unionTag.IsValid() { - // Is this field a union tag? - unionTag = dec.isUnion(v.Field(i), structTag) - } else { - // What is the selected field value of the union if we don't already know - if unionField == "" { - unionField, err = unionSelectedField(v, unionTag) - if err != nil { - return fmt.Errorf("could not determine selected union value field for %s with discriminat"+ - " tag %s: %v", v.Type().Name(), unionTag, err) - } - } - if ndrTag.HasValue(TagUnionField) && fieldName != unionField { - // is a union and this field has not been selected so will skip it. - dec.current = dec.current[:len(dec.current)-1] //This field has been skipped so remove it from the current field tracker - continue - } - } - - // Check if field is a pointer - if v.Field(i).Type().Implements(reflect.TypeOf(new(RawBytes)).Elem()) && - v.Field(i).Type().Kind() == reflect.Slice && v.Field(i).Type().Elem().Kind() == reflect.Uint8 { - //field is for rawbytes - structTag, err = addSizeToTag(v, v.Field(i), structTag) - if err != nil { - return fmt.Errorf("could not get rawbytes field(%s) size: %v", strings.Join(dec.current, "/"), err) - } - ptr, err := dec.isPointer(v.Field(i), structTag, localDef) - if err != nil { - return fmt.Errorf("could not process struct field(%s): %v", strings.Join(dec.current, "/"), err) - } - if !ptr { - err := dec.readRawBytes(v.Field(i), structTag) - if err != nil { - return fmt.Errorf("could not fill raw bytes struct field(%s): %v", strings.Join(dec.current, "/"), err) - } - } - } else { - err := dec.fill(v.Field(i), structTag, localDef) - if err != nil { - return fmt.Errorf("could not fill struct field(%s): %v", strings.Join(dec.current, "/"), err) - } - } - dec.current = dec.current[:len(dec.current)-1] //This field has been filled so remove it from the current field tracker - } - dec.current = dec.current[:len(dec.current)-1] //This field has been filled so remove it from the current field tracker - case reflect.Bool: - i, err := dec.readBool() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Uint8: - i, err := dec.readUint8() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Uint16: - i, err := dec.readUint16() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Uint32: - i, err := dec.readUint32() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Uint64: - i, err := dec.readUint64() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Int8: - i, err := dec.readInt8() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Int16: - i, err := dec.readInt16() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Int32: - i, err := dec.readInt32() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Int64: - i, err := dec.readInt64() - if err != nil { - return fmt.Errorf("could not fill %s: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.String: - ndrTag := parseTags(tag) - conformant := ndrTag.HasValue(TagConformant) - // strings are always varying so this is assumed without an explicit tag - var s string - var err error - if conformant { - s, err = dec.readConformantVaryingString(localDef) - if err != nil { - return fmt.Errorf("could not fill with conformant varying string: %v", err) - } - } else { - s, err = dec.readVaryingString(localDef) - if err != nil { - return fmt.Errorf("could not fill with varying string: %v", err) - } - } - v.Set(reflect.ValueOf(s)) - case reflect.Float32: - i, err := dec.readFloat32() - if err != nil { - return fmt.Errorf("could not fill %v: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Float64: - i, err := dec.readFloat64() - if err != nil { - return fmt.Errorf("could not fill %v: %v", v.Type().Name(), err) - } - v.Set(reflect.ValueOf(i)) - case reflect.Array: - err := dec.fillFixedArray(v, tag, localDef) - if err != nil { - return err - } - case reflect.Slice: - if v.Type().Implements(reflect.TypeOf(new(RawBytes)).Elem()) && v.Type().Elem().Kind() == reflect.Uint8 { - //field is for rawbytes - err := dec.readRawBytes(v, tag) - if err != nil { - return fmt.Errorf("could not fill raw bytes struct field(%s): %v", strings.Join(dec.current, "/"), err) - } - break - } - ndrTag := parseTags(tag) - conformant := ndrTag.HasValue(TagConformant) - varying := ndrTag.HasValue(TagVarying) - if ndrTag.HasValue(TagPipe) { - err := dec.fillPipe(v, tag) - if err != nil { - return err - } - break - } - _, t := sliceDimensions(v.Type()) - if t.Kind() == reflect.String && !ndrTag.HasValue(subStringArrayValue) { - // String array - err := dec.readStringsArray(v, tag, localDef) - if err != nil { - return err - } - break - } - // varying is assumed as fixed arrays use the Go array type rather than slice - if conformant && varying { - err := dec.fillConformantVaryingArray(v, tag, localDef) - if err != nil { - return err - } - } else if !conformant && varying { - err := dec.fillVaryingArray(v, tag, localDef) - if err != nil { - return err - } - } else { - //default to conformant and not varying - err := dec.fillConformantArray(v, tag, localDef) - if err != nil { - return err - } - } - default: - return fmt.Errorf("unsupported type") - } - return nil -} - -// readBytes returns a number of bytes from the NDR byte stream. -func (dec *Decoder) readBytes(n int) ([]byte, error) { - //TODO make this take an int64 as input to allow for larger values on all systems? - b := make([]byte, n, n) - m, err := dec.r.Read(b) - if err != nil || m != n { - return b, fmt.Errorf("error reading bytes from stream: %v", err) - } - return b, nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/error.go b/vendor/github.com/jcmturner/rpc/v2/ndr/error.go deleted file mode 100644 index 9971194..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/error.go +++ /dev/null @@ -1,18 +0,0 @@ -package ndr - -import "fmt" - -// Malformed implements the error interface for malformed NDR encoding errors. -type Malformed struct { - EText string -} - -// Error implements the error interface on the Malformed struct. -func (e Malformed) Error() string { - return fmt.Sprintf("malformed NDR stream: %s", e.EText) -} - -// Errorf formats an error message into a malformed NDR error. -func Errorf(format string, a ...interface{}) Malformed { - return Malformed{EText: fmt.Sprintf(format, a...)} -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/header.go b/vendor/github.com/jcmturner/rpc/v2/ndr/header.go deleted file mode 100644 index 1970ddb..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/header.go +++ /dev/null @@ -1,116 +0,0 @@ -package ndr - -import ( - "encoding/binary" - "fmt" -) - -/* -Serialization Version 1 -https://msdn.microsoft.com/en-us/library/cc243563.aspx - -Common Header - https://msdn.microsoft.com/en-us/library/cc243890.aspx -8 bytes in total: -- First byte - Version: Must equal 1 -- Second byte - 1st 4 bits: Endianess (0=Big; 1=Little); 2nd 4 bits: Character Encoding (0=ASCII; 1=EBCDIC) -- 3rd - Floating point representation (This does not seem to be the case in examples for Microsoft test sources) -- 4th - Common Header Length: Must equal 8 -- 5th - 8th - Filler: MUST be set to 0xcccccccc on marshaling, and SHOULD be ignored during unmarshaling. - -Private Header - https://msdn.microsoft.com/en-us/library/cc243919.aspx -8 bytes in total: -- First 4 bytes - Indicates the length of a serialized top-level type in the octet stream. It MUST include the padding length and exclude the header itself. -- Second 4 bytes - Filler: MUST be set to 0 (zero) during marshaling, and SHOULD be ignored during unmarshaling. -*/ - -const ( - protocolVersion uint8 = 1 - commonHeaderBytes uint16 = 8 - bigEndian = 0 - littleEndian = 1 - ascii uint8 = 0 - ebcdic uint8 = 1 - ieee uint8 = 0 - vax uint8 = 1 - cray uint8 = 2 - ibm uint8 = 3 -) - -// CommonHeader implements the NDR common header: https://msdn.microsoft.com/en-us/library/cc243889.aspx -type CommonHeader struct { - Version uint8 - Endianness binary.ByteOrder - CharacterEncoding uint8 - FloatRepresentation uint8 - HeaderLength uint16 - Filler []byte -} - -// PrivateHeader implements the NDR private header: https://msdn.microsoft.com/en-us/library/cc243919.aspx -type PrivateHeader struct { - ObjectBufferLength uint32 - Filler []byte -} - -func (dec *Decoder) readCommonHeader() error { - // Version - vb, err := dec.r.ReadByte() - if err != nil { - return Malformed{EText: "could not read first byte of common header for version"} - } - dec.ch.Version = uint8(vb) - if dec.ch.Version != protocolVersion { - return Malformed{EText: fmt.Sprintf("byte stream does not indicate a RPC Type serialization of version %v", protocolVersion)} - } - // Read Endianness & Character Encoding - eb, err := dec.r.ReadByte() - if err != nil { - return Malformed{EText: "could not read second byte of common header for endianness"} - } - endian := int(eb >> 4 & 0xF) - if endian != 0 && endian != 1 { - return Malformed{EText: "common header does not indicate a valid endianness"} - } - dec.ch.CharacterEncoding = uint8(vb & 0xF) - if dec.ch.CharacterEncoding != 0 && dec.ch.CharacterEncoding != 1 { - return Malformed{EText: "common header does not indicate a valid character encoding"} - } - switch endian { - case littleEndian: - dec.ch.Endianness = binary.LittleEndian - case bigEndian: - dec.ch.Endianness = binary.BigEndian - } - // Common header length - lb, err := dec.readBytes(2) - if err != nil { - return Malformed{EText: fmt.Sprintf("could not read common header length: %v", err)} - } - dec.ch.HeaderLength = dec.ch.Endianness.Uint16(lb) - if dec.ch.HeaderLength != commonHeaderBytes { - return Malformed{EText: "common header does not indicate a valid length"} - } - // Filler bytes - dec.ch.Filler, err = dec.readBytes(4) - if err != nil { - return Malformed{EText: fmt.Sprintf("could not read common header filler: %v", err)} - } - return nil -} - -func (dec *Decoder) readPrivateHeader() error { - // The next 8 bytes after the common header comprise the RPC type marshalling private header for constructed types. - err := binary.Read(dec.r, dec.ch.Endianness, &dec.ph.ObjectBufferLength) - if err != nil { - return Malformed{EText: "could not read private header object buffer length"} - } - if dec.ph.ObjectBufferLength%8 != 0 { - return Malformed{EText: "object buffer length not a multiple of 8"} - } - // Filler bytes - dec.ph.Filler, err = dec.readBytes(4) - if err != nil { - return Malformed{EText: fmt.Sprintf("could not read private header filler: %v", err)} - } - return nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/pipe.go b/vendor/github.com/jcmturner/rpc/v2/ndr/pipe.go deleted file mode 100644 index 5fd27da..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/pipe.go +++ /dev/null @@ -1,31 +0,0 @@ -package ndr - -import ( - "fmt" - "reflect" -) - -func (dec *Decoder) fillPipe(v reflect.Value, tag reflect.StructTag) error { - s, err := dec.readUint32() // read element count of first chunk - if err != nil { - return err - } - a := reflect.MakeSlice(v.Type(), 0, 0) - c := reflect.MakeSlice(v.Type(), int(s), int(s)) - for s != 0 { - for i := 0; i < int(s); i++ { - err := dec.fill(c.Index(i), tag, &[]deferedPtr{}) - if err != nil { - return fmt.Errorf("could not fill element %d of pipe: %v", i, err) - } - } - s, err = dec.readUint32() // read element count of first chunk - if err != nil { - return err - } - a = reflect.AppendSlice(a, c) - c = reflect.MakeSlice(v.Type(), int(s), int(s)) - } - v.Set(a) - return nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/primitives.go b/vendor/github.com/jcmturner/rpc/v2/ndr/primitives.go deleted file mode 100644 index 7eb1d1a..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/primitives.go +++ /dev/null @@ -1,211 +0,0 @@ -package ndr - -import ( - "bytes" - "encoding/binary" - "math" -) - -// Byte sizes of primitive types -const ( - SizeBool = 1 - SizeChar = 1 - SizeUint8 = 1 - SizeUint16 = 2 - SizeUint32 = 4 - SizeUint64 = 8 - SizeEnum = 2 - SizeSingle = 4 - SizeDouble = 8 - SizePtr = 4 -) - -// Bool is an NDR Boolean which is a logical quantity that assumes one of two values: TRUE or FALSE. -// NDR represents a Boolean as one octet. -// It represents a value of FALSE as a zero octet, an octet in which every bit is reset. -// It represents a value of TRUE as a non-zero octet, an octet in which one or more bits are set. - -// Char is an NDR character. -// NDR represents a character as one octet. -// Characters have two representation formats: ASCII and EBCDIC. - -// USmall is an unsigned 8 bit integer - -// UShort is an unsigned 16 bit integer - -// ULong is an unsigned 32 bit integer - -// UHyper is an unsigned 64 bit integer - -// Small is an signed 8 bit integer - -// Short is an signed 16 bit integer - -// Long is an signed 32 bit integer - -// Hyper is an signed 64 bit integer - -// Enum is the NDR representation of enumerated types as signed short integers (2 octets) - -// Single is an NDR defined single-precision floating-point data type - -// Double is an NDR defined double-precision floating-point data type - -// readBool reads a byte representing a boolean. -// NDR represents a Boolean as one octet. -// It represents a value of FALSE as a zero octet, an octet in which every bit is reset. -// It represents a value of TRUE as a non-zero octet, an octet in which one or more bits are set. -func (dec *Decoder) readBool() (bool, error) { - i, err := dec.readUint8() - if err != nil { - return false, err - } - if i != 0 { - return true, nil - } - return false, nil -} - -// readChar reads bytes representing a 8bit ASCII integer cast to a rune. -func (dec *Decoder) readChar() (rune, error) { - var r rune - a, err := dec.readUint8() - if err != nil { - return r, err - } - return rune(a), nil -} - -// readUint8 reads bytes representing a 8bit unsigned integer. -func (dec *Decoder) readUint8() (uint8, error) { - b, err := dec.r.ReadByte() - if err != nil { - return uint8(0), err - } - return uint8(b), nil -} - -// readUint16 reads bytes representing a 16bit unsigned integer. -func (dec *Decoder) readUint16() (uint16, error) { - dec.ensureAlignment(SizeUint16) - b, err := dec.readBytes(SizeUint16) - if err != nil { - return uint16(0), err - } - return dec.ch.Endianness.Uint16(b), nil -} - -// readUint32 reads bytes representing a 32bit unsigned integer. -func (dec *Decoder) readUint32() (uint32, error) { - dec.ensureAlignment(SizeUint32) - b, err := dec.readBytes(SizeUint32) - if err != nil { - return uint32(0), err - } - return dec.ch.Endianness.Uint32(b), nil -} - -// readUint32 reads bytes representing a 32bit unsigned integer. -func (dec *Decoder) readUint64() (uint64, error) { - dec.ensureAlignment(SizeUint64) - b, err := dec.readBytes(SizeUint64) - if err != nil { - return uint64(0), err - } - return dec.ch.Endianness.Uint64(b), nil -} - -func (dec *Decoder) readInt8() (int8, error) { - dec.ensureAlignment(SizeUint8) - b, err := dec.readBytes(SizeUint8) - if err != nil { - return 0, err - } - var i int8 - buf := bytes.NewReader(b) - err = binary.Read(buf, dec.ch.Endianness, &i) - if err != nil { - return 0, err - } - return i, nil -} - -func (dec *Decoder) readInt16() (int16, error) { - dec.ensureAlignment(SizeUint16) - b, err := dec.readBytes(SizeUint16) - if err != nil { - return 0, err - } - var i int16 - buf := bytes.NewReader(b) - err = binary.Read(buf, dec.ch.Endianness, &i) - if err != nil { - return 0, err - } - return i, nil -} - -func (dec *Decoder) readInt32() (int32, error) { - dec.ensureAlignment(SizeUint32) - b, err := dec.readBytes(SizeUint32) - if err != nil { - return 0, err - } - var i int32 - buf := bytes.NewReader(b) - err = binary.Read(buf, dec.ch.Endianness, &i) - if err != nil { - return 0, err - } - return i, nil -} - -func (dec *Decoder) readInt64() (int64, error) { - dec.ensureAlignment(SizeUint64) - b, err := dec.readBytes(SizeUint64) - if err != nil { - return 0, err - } - var i int64 - buf := bytes.NewReader(b) - err = binary.Read(buf, dec.ch.Endianness, &i) - if err != nil { - return 0, err - } - return i, nil -} - -// https://en.wikipedia.org/wiki/IEEE_754-1985 -func (dec *Decoder) readFloat32() (f float32, err error) { - dec.ensureAlignment(SizeSingle) - b, err := dec.readBytes(SizeSingle) - if err != nil { - return - } - bits := dec.ch.Endianness.Uint32(b) - f = math.Float32frombits(bits) - return -} - -func (dec *Decoder) readFloat64() (f float64, err error) { - dec.ensureAlignment(SizeDouble) - b, err := dec.readBytes(SizeDouble) - if err != nil { - return - } - bits := dec.ch.Endianness.Uint64(b) - f = math.Float64frombits(bits) - return -} - -// NDR enforces NDR alignment of primitive data; that is, any primitive of size n octets is aligned at a octet stream -// index that is a multiple of n. (In this version of NDR, n is one of {1, 2, 4, 8}.) An octet stream index indicates -// the number of an octet in an octet stream when octets are numbered, beginning with 0, from the first octet in the -// stream. Where necessary, an alignment gap, consisting of octets of unspecified value, precedes the representation -// of a primitive. The gap is of the smallest size sufficient to align the primitive. -func (dec *Decoder) ensureAlignment(n int) { - p := dec.size - dec.r.Buffered() - if s := p % n; s != 0 { - dec.r.Discard(n - s) - } -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/rawbytes.go b/vendor/github.com/jcmturner/rpc/v2/ndr/rawbytes.go deleted file mode 100644 index 9ee59fb..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/rawbytes.go +++ /dev/null @@ -1,61 +0,0 @@ -package ndr - -import ( - "errors" - "fmt" - "reflect" - "strconv" -) - -// type MyBytes []byte -// implement RawBytes interface - -const ( - sizeMethod = "Size" -) - -// RawBytes interface should be implemented if reading just a number of bytes from the NDR stream -type RawBytes interface { - Size(interface{}) int -} - -func rawBytesSize(parent reflect.Value, v reflect.Value) (int, error) { - sf := v.MethodByName(sizeMethod) - if !sf.IsValid() { - return 0, fmt.Errorf("could not find a method called %s on the implementation of RawBytes", sizeMethod) - } - in := []reflect.Value{parent} - f := sf.Call(in) - if f[0].Kind() != reflect.Int { - return 0, errors.New("the RawBytes size function did not return an integer") - } - return int(f[0].Int()), nil -} - -func addSizeToTag(parent reflect.Value, v reflect.Value, tag reflect.StructTag) (reflect.StructTag, error) { - size, err := rawBytesSize(parent, v) - if err != nil { - return tag, err - } - ndrTag := parseTags(tag) - ndrTag.Map["size"] = strconv.Itoa(size) - return ndrTag.StructTag(), nil -} - -func (dec *Decoder) readRawBytes(v reflect.Value, tag reflect.StructTag) error { - ndrTag := parseTags(tag) - sizeStr, ok := ndrTag.Map["size"] - if !ok { - return errors.New("size tag not available") - } - size, err := strconv.Atoi(sizeStr) - if err != nil { - return fmt.Errorf("size not valid: %v", err) - } - b, err := dec.readBytes(size) - if err != nil { - return err - } - v.Set(reflect.ValueOf(b).Convert(v.Type())) - return nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/strings.go b/vendor/github.com/jcmturner/rpc/v2/ndr/strings.go deleted file mode 100644 index b7a910b..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/strings.go +++ /dev/null @@ -1,70 +0,0 @@ -package ndr - -import ( - "fmt" - "reflect" -) - -const ( - subStringArrayTag = `ndr:"varying,X-subStringArray"` - subStringArrayValue = "X-subStringArray" -) - -func uint16SliceToString(a []uint16) string { - s := make([]rune, len(a), len(a)) - for i := range s { - s[i] = rune(a[i]) - } - if len(s) > 0 { - // Remove any null terminator - if s[len(s)-1] == rune(0) { - s = s[:len(s)-1] - } - } - return string(s) -} - -func (dec *Decoder) readVaryingString(def *[]deferedPtr) (string, error) { - a := new([]uint16) - v := reflect.ValueOf(a) - var t reflect.StructTag - err := dec.fillUniDimensionalVaryingArray(v.Elem(), t, def) - if err != nil { - return "", err - } - s := uint16SliceToString(*a) - return s, nil -} - -func (dec *Decoder) readConformantVaryingString(def *[]deferedPtr) (string, error) { - a := new([]uint16) - v := reflect.ValueOf(a) - var t reflect.StructTag - err := dec.fillUniDimensionalConformantVaryingArray(v.Elem(), t, def) - if err != nil { - return "", err - } - s := uint16SliceToString(*a) - return s, nil -} - -func (dec *Decoder) readStringsArray(v reflect.Value, tag reflect.StructTag, def *[]deferedPtr) error { - d, _ := sliceDimensions(v.Type()) - ndrTag := parseTags(tag) - var m []int - //var ms int - if ndrTag.HasValue(TagConformant) { - for i := 0; i < d; i++ { - m = append(m, int(dec.precedingMax())) - } - //common max size - _ = dec.precedingMax() - //ms = int(n) - } - tag = reflect.StructTag(subStringArrayTag) - err := dec.fillVaryingArray(v, tag, def) - if err != nil { - return fmt.Errorf("could not read string array: %v", err) - } - return nil -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/tags.go b/vendor/github.com/jcmturner/rpc/v2/ndr/tags.go deleted file mode 100644 index 01657e0..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/tags.go +++ /dev/null @@ -1,69 +0,0 @@ -package ndr - -import ( - "fmt" - "reflect" - "strings" -) - -const ndrNameSpace = "ndr" - -type tags struct { - Values []string - Map map[string]string -} - -// parse the struct field tags and extract the ndr related ones. -// format of tag ndr:"value,key:value1,value2" -func parseTags(st reflect.StructTag) tags { - s := st.Get(ndrNameSpace) - t := tags{ - Values: []string{}, - Map: make(map[string]string), - } - if s != "" { - ndrTags := strings.Trim(s, `"`) - for _, tag := range strings.Split(ndrTags, ",") { - if strings.Contains(tag, ":") { - m := strings.SplitN(tag, ":", 2) - t.Map[m[0]] = m[1] - } else { - t.Values = append(t.Values, tag) - } - } - } - return t -} - -func appendTag(t reflect.StructTag, s string) reflect.StructTag { - ts := t.Get(ndrNameSpace) - ts = fmt.Sprintf(`%s"%s,%s"`, ndrNameSpace, ts, s) - return reflect.StructTag(ts) -} - -func (t *tags) StructTag() reflect.StructTag { - mv := t.Values - for key, val := range t.Map { - mv = append(mv, key+":"+val) - } - s := ndrNameSpace + ":" + `"` + strings.Join(mv, ",") + `"` - return reflect.StructTag(s) -} - -func (t *tags) delete(s string) { - for i, x := range t.Values { - if x == s { - t.Values = append(t.Values[:i], t.Values[i+1:]...) - } - } - delete(t.Map, s) -} - -func (t *tags) HasValue(s string) bool { - for _, v := range t.Values { - if v == s { - return true - } - } - return false -} diff --git a/vendor/github.com/jcmturner/rpc/v2/ndr/union.go b/vendor/github.com/jcmturner/rpc/v2/ndr/union.go deleted file mode 100644 index 6a657fa..0000000 --- a/vendor/github.com/jcmturner/rpc/v2/ndr/union.go +++ /dev/null @@ -1,57 +0,0 @@ -package ndr - -import ( - "errors" - "fmt" - "reflect" -) - -// Union interface must be implemented by structs that will be unmarshaled into from the NDR byte stream union representation. -// The union's discriminating tag will be passed to the SwitchFunc method. -// The discriminating tag field must have the struct tag: `ndr:"unionTag"` -// If the union is encapsulated the discriminating tag field must have the struct tag: `ndr:"encapsulated"` -// The possible value fields that can be selected from must have the struct tag: `ndr:"unionField"` -type Union interface { - SwitchFunc(t interface{}) string -} - -// Union related constants such as struct tag values -const ( - unionSelectionFuncName = "SwitchFunc" - TagEncapsulated = "encapsulated" - TagUnionTag = "unionTag" - TagUnionField = "unionField" -) - -func (dec *Decoder) isUnion(field reflect.Value, tag reflect.StructTag) (r reflect.Value) { - ndrTag := parseTags(tag) - if !ndrTag.HasValue(TagUnionTag) { - return - } - r = field - // For a non-encapsulated union, the discriminant is marshalled into the transmitted data stream twice: once as the - // field or parameter, which is referenced by the switch_is construct, in the procedure argument list; and once as - // the first part of the union representation. - if !ndrTag.HasValue(TagEncapsulated) { - dec.r.Discard(int(r.Type().Size())) - } - return -} - -// unionSelectedField returns the field name of which of the union values to fill -func unionSelectedField(union, discriminant reflect.Value) (string, error) { - if !union.Type().Implements(reflect.TypeOf(new(Union)).Elem()) { - return "", errors.New("struct does not implement union interface") - } - args := []reflect.Value{discriminant} - // Call the SelectFunc of the union struct to find the name of the field to fill with the value selected. - sf := union.MethodByName(unionSelectionFuncName) - if !sf.IsValid() { - return "", fmt.Errorf("could not find a selection function called %s in the unions struct representation", unionSelectionFuncName) - } - f := sf.Call(args) - if f[0].Kind() != reflect.String || f[0].String() == "" { - return "", fmt.Errorf("the union select function did not return a string for the name of the field to fill") - } - return f[0].String(), nil -} diff --git a/vendor/github.com/labstack/echo/v4/.travis.yml b/vendor/github.com/labstack/echo/v4/.travis.yml index a1fc876..ef826e9 100644 --- a/vendor/github.com/labstack/echo/v4/.travis.yml +++ b/vendor/github.com/labstack/echo/v4/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.12.x - - 1.13.x + - 1.14.x + - 1.15.x - tip env: - GO111MODULE=on diff --git a/vendor/github.com/labstack/echo/v4/README.md b/vendor/github.com/labstack/echo/v4/README.md index c57d478..d9d9613 100644 --- a/vendor/github.com/labstack/echo/v4/README.md +++ b/vendor/github.com/labstack/echo/v4/README.md @@ -17,7 +17,7 @@ Therefore a Go version capable of understanding /vN suffixed imports is required - 1.9.7+ - 1.10.3+ -- 1.11+ +- 1.14+ Any of these versions will allow you to import Echo as `github.com/labstack/echo/v4` which is the recommended way of using Echo going forward. @@ -52,7 +52,7 @@ Lower is better! ### Installation -```go +```sh // go get github.com/labstack/echo/{version} go get github.com/labstack/echo/v4 ``` diff --git a/vendor/github.com/labstack/echo/v4/echo.go b/vendor/github.com/labstack/echo/v4/echo.go index 511eb43..18c1101 100644 --- a/vendor/github.com/labstack/echo/v4/echo.go +++ b/vendor/github.com/labstack/echo/v4/echo.go @@ -48,6 +48,7 @@ import ( "net" "net/http" "net/url" + "os" "path" "path/filepath" "reflect" @@ -230,7 +231,7 @@ const ( const ( // Version of Echo - Version = "4.1.16" + Version = "4.1.17" website = "https://echo.labstack.com" // http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo banner = ` @@ -479,7 +480,20 @@ func (common) static(prefix, root string, get func(string, HandlerFunc, ...Middl if err != nil { return err } + name := filepath.Join(root, path.Clean("/"+p)) // "/"+ for security + fi, err := os.Stat(name) + if err != nil { + // The access path does not exist + return NotFoundHandler(c) + } + + // If the request is for a directory and does not end with "/" + p = c.Request().URL.Path // path must not be empty. + if fi.IsDir() && p[len(p)-1] != '/' { + // Redirect to ends with "/" + return c.Redirect(http.StatusMovedPermanently, p+"/") + } return c.File(name) } if prefix == "/" { @@ -504,11 +518,7 @@ func (e *Echo) add(host, method, path string, handler HandlerFunc, middleware .. name := handlerName(handler) router := e.findRouter(host) router.Add(method, path, func(c Context) error { - h := handler - // Chain middleware - for i := len(middleware) - 1; i >= 0; i-- { - h = middleware[i](h) - } + h := applyMiddleware(handler, middleware...) return h(c) }) r := &Route{ @@ -606,12 +616,12 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) { h := NotFoundHandler if e.premiddleware == nil { - e.findRouter(r.Host).Find(r.Method, getPath(r), c) + e.findRouter(r.Host).Find(r.Method, GetPath(r), c) h = c.Handler() h = applyMiddleware(h, e.middleware...) } else { h = func(c Context) error { - e.findRouter(r.Host).Find(r.Method, getPath(r), c) + e.findRouter(r.Host).Find(r.Method, GetPath(r), c) h := c.Handler() h = applyMiddleware(h, e.middleware...) return h(c) @@ -795,6 +805,11 @@ func (he *HTTPError) SetInternal(err error) *HTTPError { return he } +// Unwrap satisfies the Go 1.13 error wrapper interface. +func (he *HTTPError) Unwrap() error { + return he.Internal +} + // WrapHandler wraps `http.Handler` into `echo.HandlerFunc`. func WrapHandler(h http.Handler) HandlerFunc { return func(c Context) error { @@ -817,7 +832,8 @@ func WrapMiddleware(m func(http.Handler) http.Handler) MiddlewareFunc { } } -func getPath(r *http.Request) string { +// GetPath returns RawPath, if it's empty returns Path from URL +func GetPath(r *http.Request) string { path := r.URL.RawPath if path == "" { path = r.URL.Path diff --git a/vendor/github.com/labstack/echo/v4/go.mod b/vendor/github.com/labstack/echo/v4/go.mod index b3ac080..74c6a9a 100644 --- a/vendor/github.com/labstack/echo/v4/go.mod +++ b/vendor/github.com/labstack/echo/v4/go.mod @@ -1,14 +1,15 @@ module github.com/labstack/echo/v4 -go 1.14 +go 1.15 require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/labstack/gommon v0.3.0 - github.com/mattn/go-colorable v0.1.6 // indirect + github.com/mattn/go-colorable v0.1.7 // indirect github.com/stretchr/testify v1.4.0 - github.com/valyala/fasttemplate v1.1.0 - golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d - golang.org/x/net v0.0.0-20200226121028-0de0cce0169b - golang.org/x/text v0.3.2 // indirect + github.com/valyala/fasttemplate v1.2.1 + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a + golang.org/x/net v0.0.0-20200822124328-c89045814202 + golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 // indirect + golang.org/x/text v0.3.3 // indirect ) diff --git a/vendor/github.com/labstack/echo/v4/go.sum b/vendor/github.com/labstack/echo/v4/go.sum index 8e7e54c..58c80c8 100644 --- a/vendor/github.com/labstack/echo/v4/go.sum +++ b/vendor/github.com/labstack/echo/v4/go.sum @@ -1,14 +1,13 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v1.0.2 h1:KPldsxuKGsS2FPWsNeg9ZO18aCrGKujPoWXn2yo+KQM= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= @@ -23,14 +22,15 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4= -github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -39,11 +39,15 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 h1:DvY3Zkh7KabQE/kfzMvYvKirSiguP9Q/veMtkYyf0o8= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/labstack/echo/v4/group.go b/vendor/github.com/labstack/echo/v4/group.go index 5d95825..426bef9 100644 --- a/vendor/github.com/labstack/echo/v4/group.go +++ b/vendor/github.com/labstack/echo/v4/group.go @@ -109,7 +109,7 @@ func (g *Group) Static(prefix, root string) { // File implements `Echo#File()` for sub-routes within the Group. func (g *Group) File(path, file string) { - g.file(g.prefix+path, file, g.GET) + g.file(path, file, g.GET) } // Add implements `Echo#Add()` for sub-routes within the Group. diff --git a/vendor/github.com/labstack/echo/v4/router.go b/vendor/github.com/labstack/echo/v4/router.go index 15a3398..ed728d6 100644 --- a/vendor/github.com/labstack/echo/v4/router.go +++ b/vendor/github.com/labstack/echo/v4/router.go @@ -355,6 +355,10 @@ func (r *Router) Find(method, path string, c Context) { // Attempt to go back up the tree on no matching prefix or no remaining search if l != pl || search == "" { + // Handle special case of trailing slash route with existing any route (see #1526) + if path[len(path)-1] == '/' && cn.findChildByKind(akind) != nil { + goto Any + } if nn == nil { // Issue #1348 return // Not found } diff --git a/vendor/github.com/lib/pq/.gitignore b/vendor/github.com/lib/pq/.gitignore index 0f1d00e..3243952 100644 --- a/vendor/github.com/lib/pq/.gitignore +++ b/vendor/github.com/lib/pq/.gitignore @@ -2,3 +2,5 @@ *.test *~ *.swp +.idea +.vscode \ No newline at end of file diff --git a/vendor/github.com/lib/pq/.travis.yml b/vendor/github.com/lib/pq/.travis.yml index 3498c53..f378207 100644 --- a/vendor/github.com/lib/pq/.travis.yml +++ b/vendor/github.com/lib/pq/.travis.yml @@ -1,8 +1,8 @@ language: go go: - - 1.13.x - 1.14.x + - 1.15.x - master sudo: true @@ -13,6 +13,7 @@ env: - PQGOSSLTESTS=1 - PQSSLCERTTEST_PATH=$PWD/certs - PGHOST=127.0.0.1 + - GODEBUG=x509ignoreCN=0 matrix: - PGVERSION=10 - PGVERSION=9.6 diff --git a/vendor/github.com/lib/pq/array.go b/vendor/github.com/lib/pq/array.go index e4933e2..405da23 100644 --- a/vendor/github.com/lib/pq/array.go +++ b/vendor/github.com/lib/pq/array.go @@ -35,19 +35,31 @@ func Array(a interface{}) interface { return (*BoolArray)(&a) case []float64: return (*Float64Array)(&a) + case []float32: + return (*Float32Array)(&a) case []int64: return (*Int64Array)(&a) + case []int32: + return (*Int32Array)(&a) case []string: return (*StringArray)(&a) + case [][]byte: + return (*ByteaArray)(&a) case *[]bool: return (*BoolArray)(a) case *[]float64: return (*Float64Array)(a) + case *[]float32: + return (*Float32Array)(a) case *[]int64: return (*Int64Array)(a) + case *[]int32: + return (*Int32Array)(a) case *[]string: return (*StringArray)(a) + case *[][]byte: + return (*ByteaArray)(a) } return GenericArray{a} @@ -267,6 +279,70 @@ func (a Float64Array) Value() (driver.Value, error) { return "{}", nil } +// Float32Array represents a one-dimensional array of the PostgreSQL double +// precision type. +type Float32Array []float32 + +// Scan implements the sql.Scanner interface. +func (a *Float32Array) Scan(src interface{}) error { + switch src := src.(type) { + case []byte: + return a.scanBytes(src) + case string: + return a.scanBytes([]byte(src)) + case nil: + *a = nil + return nil + } + + return fmt.Errorf("pq: cannot convert %T to Float32Array", src) +} + +func (a *Float32Array) scanBytes(src []byte) error { + elems, err := scanLinearArray(src, []byte{','}, "Float32Array") + if err != nil { + return err + } + if *a != nil && len(elems) == 0 { + *a = (*a)[:0] + } else { + b := make(Float32Array, len(elems)) + for i, v := range elems { + var x float64 + if x, err = strconv.ParseFloat(string(v), 32); err != nil { + return fmt.Errorf("pq: parsing array element index %d: %v", i, err) + } + b[i] = float32(x) + } + *a = b + } + return nil +} + +// Value implements the driver.Valuer interface. +func (a Float32Array) Value() (driver.Value, error) { + if a == nil { + return nil, nil + } + + if n := len(a); n > 0 { + // There will be at least two curly brackets, N bytes of values, + // and N-1 bytes of delimiters. + b := make([]byte, 1, 1+2*n) + b[0] = '{' + + b = strconv.AppendFloat(b, float64(a[0]), 'f', -1, 32) + for i := 1; i < n; i++ { + b = append(b, ',') + b = strconv.AppendFloat(b, float64(a[i]), 'f', -1, 32) + } + + return string(append(b, '}')), nil + } + + return "{}", nil +} + // GenericArray implements the driver.Valuer and sql.Scanner interfaces for // an array or slice of any dimension. type GenericArray struct{ A interface{} } @@ -483,6 +559,69 @@ func (a Int64Array) Value() (driver.Value, error) { return "{}", nil } +// Int32Array represents a one-dimensional array of the PostgreSQL integer types. +type Int32Array []int32 + +// Scan implements the sql.Scanner interface. +func (a *Int32Array) Scan(src interface{}) error { + switch src := src.(type) { + case []byte: + return a.scanBytes(src) + case string: + return a.scanBytes([]byte(src)) + case nil: + *a = nil + return nil + } + + return fmt.Errorf("pq: cannot convert %T to Int32Array", src) +} + +func (a *Int32Array) scanBytes(src []byte) error { + elems, err := scanLinearArray(src, []byte{','}, "Int32Array") + if err != nil { + return err + } + if *a != nil && len(elems) == 0 { + *a = (*a)[:0] + } else { + b := make(Int32Array, len(elems)) + for i, v := range elems { + var x int + if x, err = strconv.Atoi(string(v)); err != nil { + return fmt.Errorf("pq: parsing array element index %d: %v", i, err) + } + b[i] = int32(x) + } + *a = b + } + return nil +} + +// Value implements the driver.Valuer interface. +func (a Int32Array) Value() (driver.Value, error) { + if a == nil { + return nil, nil + } + + if n := len(a); n > 0 { + // There will be at least two curly brackets, N bytes of values, + // and N-1 bytes of delimiters. + b := make([]byte, 1, 1+2*n) + b[0] = '{' + + b = strconv.AppendInt(b, int64(a[0]), 10) + for i := 1; i < n; i++ { + b = append(b, ',') + b = strconv.AppendInt(b, int64(a[i]), 10) + } + + return string(append(b, '}')), nil + } + + return "{}", nil +} + // StringArray represents a one-dimensional array of the PostgreSQL character types. type StringArray []string diff --git a/vendor/github.com/lib/pq/conn.go b/vendor/github.com/lib/pq/conn.go index d95fb88..db0b6ce 100644 --- a/vendor/github.com/lib/pq/conn.go +++ b/vendor/github.com/lib/pq/conn.go @@ -18,6 +18,7 @@ import ( "path/filepath" "strconv" "strings" + "sync/atomic" "time" "unicode" @@ -38,13 +39,18 @@ var ( errNoLastInsertID = errors.New("no LastInsertId available after the empty statement") ) +// Compile time validation that our types implement the expected interfaces +var ( + _ driver.Driver = Driver{} +) + // Driver is the Postgres database driver. type Driver struct{} // Open opens a new connection to the database. name is a connection string. // Most users should only use it through database/sql package from the standard // library. -func (d *Driver) Open(name string) (driver.Conn, error) { +func (d Driver) Open(name string) (driver.Conn, error) { return Open(name) } @@ -136,7 +142,7 @@ type conn struct { // If true, this connection is bad and all public-facing functions should // return ErrBadConn. - bad bool + bad *atomic.Value // If set, this connection should never use the binary format when // receiving query results from prepared statements. Only provided for @@ -157,7 +163,7 @@ type conn struct { notificationHandler func(*Notification) // GSSAPI context - gss Gss + gss GSS } // Handle driver-side settings in parsed connection string. @@ -294,9 +300,12 @@ func (c *Connector) open(ctx context.Context) (cn *conn, err error) { o := c.opts + bad := &atomic.Value{} + bad.Store(false) cn = &conn{ opts: o, dialer: c.dialer, + bad: bad, } err = cn.handleDriverSettings(o) if err != nil { @@ -501,9 +510,22 @@ func (cn *conn) isInTransaction() bool { cn.txnStatus == txnStatusInFailedTransaction } +func (cn *conn) setBad() { + if cn.bad != nil { + cn.bad.Store(true) + } +} + +func (cn *conn) getBad() bool { + if cn.bad != nil { + return cn.bad.Load().(bool) + } + return false +} + func (cn *conn) checkIsInTransaction(intxn bool) { if cn.isInTransaction() != intxn { - cn.bad = true + cn.setBad() errorf("unexpected transaction status %v", cn.txnStatus) } } @@ -513,7 +535,7 @@ func (cn *conn) Begin() (_ driver.Tx, err error) { } func (cn *conn) begin(mode string) (_ driver.Tx, err error) { - if cn.bad { + if cn.getBad() { return nil, driver.ErrBadConn } defer cn.errRecover(&err) @@ -524,11 +546,11 @@ func (cn *conn) begin(mode string) (_ driver.Tx, err error) { return nil, err } if commandTag != "BEGIN" { - cn.bad = true + cn.setBad() return nil, fmt.Errorf("unexpected command tag %s", commandTag) } if cn.txnStatus != txnStatusIdleInTransaction { - cn.bad = true + cn.setBad() return nil, fmt.Errorf("unexpected transaction status %v", cn.txnStatus) } return cn, nil @@ -542,7 +564,7 @@ func (cn *conn) closeTxn() { func (cn *conn) Commit() (err error) { defer cn.closeTxn() - if cn.bad { + if cn.getBad() { return driver.ErrBadConn } defer cn.errRecover(&err) @@ -564,12 +586,12 @@ func (cn *conn) Commit() (err error) { _, commandTag, err := cn.simpleExec("COMMIT") if err != nil { if cn.isInTransaction() { - cn.bad = true + cn.setBad() } return err } if commandTag != "COMMIT" { - cn.bad = true + cn.setBad() return fmt.Errorf("unexpected command tag %s", commandTag) } cn.checkIsInTransaction(false) @@ -578,7 +600,7 @@ func (cn *conn) Commit() (err error) { func (cn *conn) Rollback() (err error) { defer cn.closeTxn() - if cn.bad { + if cn.getBad() { return driver.ErrBadConn } defer cn.errRecover(&err) @@ -590,7 +612,7 @@ func (cn *conn) rollback() (err error) { _, commandTag, err := cn.simpleExec("ROLLBACK") if err != nil { if cn.isInTransaction() { - cn.bad = true + cn.setBad() } return err } @@ -630,7 +652,7 @@ func (cn *conn) simpleExec(q string) (res driver.Result, commandTag string, err case 'T', 'D': // ignore any results default: - cn.bad = true + cn.setBad() errorf("unknown response for simple query: %q", t) } } @@ -652,7 +674,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { // the user can close, though, to avoid connections from being // leaked. A "rows" with done=true works fine for that purpose. if err != nil { - cn.bad = true + cn.setBad() errorf("unexpected message %q in simple query execution", t) } if res == nil { @@ -663,8 +685,11 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { // Set the result and tag to the last command complete if there wasn't a // query already run. Although queries usually return from here and cede // control to Next, a query with zero results does not. - if t == 'C' && res.colNames == nil { + if t == 'C' { res.result, res.tag = cn.parseComplete(r.string()) + if res.colNames != nil { + return + } } res.done = true case 'Z': @@ -676,7 +701,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { err = parseError(r) case 'D': if res == nil { - cn.bad = true + cn.setBad() errorf("unexpected DataRow in simple query execution") } // the query didn't fail; kick off to Next @@ -691,7 +716,7 @@ func (cn *conn) simpleQuery(q string) (res *rows, err error) { // To work around a bug in QueryRow in Go 1.2 and earlier, wait // until the first DataRow has been received. default: - cn.bad = true + cn.setBad() errorf("unknown response for simple query: %q", t) } } @@ -784,7 +809,7 @@ func (cn *conn) prepareTo(q, stmtName string) *stmt { } func (cn *conn) Prepare(q string) (_ driver.Stmt, err error) { - if cn.bad { + if cn.getBad() { return nil, driver.ErrBadConn } defer cn.errRecover(&err) @@ -823,7 +848,7 @@ func (cn *conn) Query(query string, args []driver.Value) (driver.Rows, error) { } func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) { - if cn.bad { + if cn.getBad() { return nil, driver.ErrBadConn } if cn.inCopy { @@ -857,7 +882,7 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) { // Implement the optional "Execer" interface for one-shot queries func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err error) { - if cn.bad { + if cn.getBad() { return nil, driver.ErrBadConn } defer cn.errRecover(&err) @@ -891,9 +916,20 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err return r, err } +type safeRetryError struct { + Err error +} + +func (se *safeRetryError) Error() string { + return se.Err.Error() +} + func (cn *conn) send(m *writeBuf) { - _, err := cn.c.Write(m.wrap()) + n, err := cn.c.Write(m.wrap()) if err != nil { + if n == 0 { + err = &safeRetryError{Err: err} + } panic(err) } } @@ -918,7 +954,7 @@ func (cn *conn) sendSimpleMessage(typ byte) (err error) { // the message yourself. func (cn *conn) saveMessage(typ byte, buf *readBuf) { if cn.saveMessageType != 0 { - cn.bad = true + cn.setBad() errorf("unexpected saveMessageType %d", cn.saveMessageType) } cn.saveMessageType = typ @@ -1074,9 +1110,9 @@ func isDriverSetting(key string) bool { return true case "binary_parameters": return true - case "service": + case "krbsrvname": return true - case "spn": + case "krbspn": return true default: return false @@ -1158,20 +1194,23 @@ func (cn *conn) auth(r *readBuf, o values) { errorf("unexpected authentication response: %q", t) } case 7: // GSSAPI, startup - cli, err := NewGSS() + if newGss == nil { + errorf("kerberos error: no GSSAPI provider registered (import github.com/lib/pq/auth/kerberos if you need Kerberos support)") + } + cli, err := newGss() if err != nil { errorf("kerberos error: %s", err.Error()) } var token []byte - if spn, ok := o["spn"]; ok { + if spn, ok := o["krbspn"]; ok { // Use the supplied SPN if provided.. token, err = cli.GetInitTokenFromSpn(spn) } else { // Allow the kerberos service name to be overridden service := "postgres" - if val, ok := o["service"]; ok { + if val, ok := o["krbsrvname"]; ok { service = val } @@ -1285,7 +1324,7 @@ func (st *stmt) Close() (err error) { if st.closed { return nil } - if st.cn.bad { + if st.cn.getBad() { return driver.ErrBadConn } defer st.cn.errRecover(&err) @@ -1299,14 +1338,14 @@ func (st *stmt) Close() (err error) { t, _ := st.cn.recv1() if t != '3' { - st.cn.bad = true + st.cn.setBad() errorf("unexpected close response: %q", t) } st.closed = true t, r := st.cn.recv1() if t != 'Z' { - st.cn.bad = true + st.cn.setBad() errorf("expected ready for query, but got: %q", t) } st.cn.processReadyForQuery(r) @@ -1315,7 +1354,7 @@ func (st *stmt) Close() (err error) { } func (st *stmt) Query(v []driver.Value) (r driver.Rows, err error) { - if st.cn.bad { + if st.cn.getBad() { return nil, driver.ErrBadConn } defer st.cn.errRecover(&err) @@ -1328,7 +1367,7 @@ func (st *stmt) Query(v []driver.Value) (r driver.Rows, err error) { } func (st *stmt) Exec(v []driver.Value) (res driver.Result, err error) { - if st.cn.bad { + if st.cn.getBad() { return nil, driver.ErrBadConn } defer st.cn.errRecover(&err) @@ -1415,7 +1454,7 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) { if affectedRows == nil && strings.HasPrefix(commandTag, "INSERT ") { parts := strings.Split(commandTag, " ") if len(parts) != 3 { - cn.bad = true + cn.setBad() errorf("unexpected INSERT command tag %s", commandTag) } affectedRows = &parts[len(parts)-1] @@ -1427,7 +1466,7 @@ func (cn *conn) parseComplete(commandTag string) (driver.Result, string) { } n, err := strconv.ParseInt(*affectedRows, 10, 64) if err != nil { - cn.bad = true + cn.setBad() errorf("could not parse commandTag: %s", err) } return driver.RowsAffected(n), commandTag @@ -1494,7 +1533,7 @@ func (rs *rows) Next(dest []driver.Value) (err error) { } conn := rs.cn - if conn.bad { + if conn.getBad() { return driver.ErrBadConn } defer conn.errRecover(&err) @@ -1519,7 +1558,7 @@ func (rs *rows) Next(dest []driver.Value) (err error) { case 'D': n := rs.rb.int16() if err != nil { - conn.bad = true + conn.setBad() errorf("unexpected DataRow after error %s", err) } if n < len(dest) { @@ -1714,7 +1753,7 @@ func (cn *conn) readReadyForQuery() { cn.processReadyForQuery(r) return default: - cn.bad = true + cn.setBad() errorf("unexpected message %q; expected ReadyForQuery", t) } } @@ -1734,7 +1773,7 @@ func (cn *conn) readParseResponse() { cn.readReadyForQuery() panic(err) default: - cn.bad = true + cn.setBad() errorf("unexpected Parse response %q", t) } } @@ -1759,7 +1798,7 @@ func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames [ cn.readReadyForQuery() panic(err) default: - cn.bad = true + cn.setBad() errorf("unexpected Describe statement response %q", t) } } @@ -1777,7 +1816,7 @@ func (cn *conn) readPortalDescribeResponse() rowsHeader { cn.readReadyForQuery() panic(err) default: - cn.bad = true + cn.setBad() errorf("unexpected Describe response %q", t) } panic("not reached") @@ -1793,7 +1832,7 @@ func (cn *conn) readBindResponse() { cn.readReadyForQuery() panic(err) default: - cn.bad = true + cn.setBad() errorf("unexpected Bind response %q", t) } } @@ -1820,7 +1859,7 @@ func (cn *conn) postExecuteWorkaround() { cn.saveMessage(t, r) return default: - cn.bad = true + cn.setBad() errorf("unexpected message during extended query execution: %q", t) } } @@ -1833,7 +1872,7 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co switch t { case 'C': if err != nil { - cn.bad = true + cn.setBad() errorf("unexpected CommandComplete after error %s", err) } res, commandTag = cn.parseComplete(r.string()) @@ -1847,7 +1886,7 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co err = parseError(r) case 'T', 'D', 'I': if err != nil { - cn.bad = true + cn.setBad() errorf("unexpected %q after error %s", t, err) } if t == 'I' { @@ -1855,7 +1894,7 @@ func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, co } // ignore any results default: - cn.bad = true + cn.setBad() errorf("unknown %s response: %q", protocolState, t) } } diff --git a/vendor/github.com/lib/pq/conn_go18.go b/vendor/github.com/lib/pq/conn_go18.go index 09e2ea4..8cab67c 100644 --- a/vendor/github.com/lib/pq/conn_go18.go +++ b/vendor/github.com/lib/pq/conn_go18.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "io/ioutil" + "sync/atomic" "time" ) @@ -89,10 +90,21 @@ func (cn *conn) Ping(ctx context.Context) error { func (cn *conn) watchCancel(ctx context.Context) func() { if done := ctx.Done(); done != nil { - finished := make(chan struct{}) + finished := make(chan struct{}, 1) go func() { select { case <-done: + select { + case finished <- struct{}{}: + default: + // We raced with the finish func, let the next query handle this with the + // context. + return + } + + // Set the connection state to bad so it does not get reused. + cn.setBad() + // At this point the function level context is canceled, // so it must not be used for the additional network // request to cancel the query. @@ -101,13 +113,14 @@ func (cn *conn) watchCancel(ctx context.Context) func() { defer cancel() _ = cn.cancel(ctxCancel) - finished <- struct{}{} case <-finished: } }() return func() { select { case <-finished: + cn.setBad() + cn.Close() case finished <- struct{}{}: } } @@ -123,8 +136,11 @@ func (cn *conn) cancel(ctx context.Context) error { defer c.Close() { + bad := &atomic.Value{} + bad.Store(false) can := conn{ - c: c, + c: c, + bad: bad, } err = can.ssl(cn.opts) if err != nil { diff --git a/vendor/github.com/lib/pq/connector.go b/vendor/github.com/lib/pq/connector.go index 6a0ee7f..d7d4726 100644 --- a/vendor/github.com/lib/pq/connector.go +++ b/vendor/github.com/lib/pq/connector.go @@ -27,7 +27,7 @@ func (c *Connector) Connect(ctx context.Context) (driver.Conn, error) { return c.open(ctx) } -// Driver returnst the underlying driver of this Connector. +// Driver returns the underlying driver of this Connector. func (c *Connector) Driver() driver.Driver { return &Driver{} } diff --git a/vendor/github.com/lib/pq/copy.go b/vendor/github.com/lib/pq/copy.go index d3bc1ed..bb3cbd7 100644 --- a/vendor/github.com/lib/pq/copy.go +++ b/vendor/github.com/lib/pq/copy.go @@ -49,6 +49,7 @@ type copyin struct { buffer []byte rowData chan []byte done chan bool + driver.Result closed bool @@ -151,6 +152,8 @@ func (ci *copyin) resploop() { switch t { case 'C': // complete + res, _ := ci.cn.parseComplete(r.string()) + ci.setResult(res) case 'N': if n := ci.cn.noticeHandler; n != nil { n(parseError(&r)) @@ -173,13 +176,13 @@ func (ci *copyin) resploop() { func (ci *copyin) setBad() { ci.Lock() - ci.cn.bad = true + ci.cn.setBad() ci.Unlock() } func (ci *copyin) isBad() bool { ci.Lock() - b := ci.cn.bad + b := ci.cn.getBad() ci.Unlock() return b } @@ -201,6 +204,22 @@ func (ci *copyin) setError(err error) { ci.Unlock() } +func (ci *copyin) setResult(result driver.Result) { + ci.Lock() + ci.Result = result + ci.Unlock() +} + +func (ci *copyin) getResult() driver.Result { + ci.Lock() + result := ci.Result + ci.Unlock() + if result == nil { + return driver.RowsAffected(0) + } + return result +} + func (ci *copyin) NumInput() int { return -1 } @@ -231,7 +250,11 @@ func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) { } if len(v) == 0 { - return driver.RowsAffected(0), ci.Close() + if err := ci.Close(); err != nil { + return driver.RowsAffected(0), err + } + + return ci.getResult(), nil } numValues := len(v) diff --git a/vendor/github.com/lib/pq/doc.go b/vendor/github.com/lib/pq/doc.go index 1669597..b571848 100644 --- a/vendor/github.com/lib/pq/doc.go +++ b/vendor/github.com/lib/pq/doc.go @@ -57,8 +57,6 @@ supported: * sslkey - Key file location. The file must contain PEM encoded data. * sslrootcert - The location of the root certificate file. The file must contain PEM encoded data. - * spn - Configures GSS (Kerberos) SPN. - * service - GSS (Kerberos) service name to use when constructing the SPN (default is `postgres`). Valid values for sslmode are: @@ -243,5 +241,28 @@ bytes by the PostgreSQL server. You can find a complete, working example of Listener usage at https://godoc.org/github.com/lib/pq/example/listen. + +Kerberos Support + + +If you need support for Kerberos authentication, add the following to your main +package: + + import "github.com/lib/pq/auth/kerberos" + + func init() { + pq.RegisterGSSProvider(func() (pq.Gss, error) { return kerberos.NewGSS() }) + } + +This package is in a separate module so that users who don't need Kerberos +don't have to download unnecessary dependencies. + +When imported, additional connection string parameters are supported: + + * krbsrvname - GSS (Kerberos) service name when constructing the + SPN (default is `postgres`). This will be combined with the host + to form the full SPN: `krbsrvname/host`. + * krbspn - GSS (Kerberos) SPN. This takes priority over + `krbsrvname` if present. */ package pq diff --git a/vendor/github.com/lib/pq/error.go b/vendor/github.com/lib/pq/error.go index 3d66ba7..c19c349 100644 --- a/vendor/github.com/lib/pq/error.go +++ b/vendor/github.com/lib/pq/error.go @@ -484,7 +484,7 @@ func (cn *conn) errRecover(err *error) { case nil: // Do nothing case runtime.Error: - cn.bad = true + cn.setBad() panic(v) case *Error: if v.Fatal() { @@ -493,8 +493,11 @@ func (cn *conn) errRecover(err *error) { *err = v } case *net.OpError: - cn.bad = true + cn.setBad() *err = v + case *safeRetryError: + cn.setBad() + *err = driver.ErrBadConn case error: if v == io.EOF || v.(error).Error() == "remote error: handshake failure" { *err = driver.ErrBadConn @@ -503,13 +506,13 @@ func (cn *conn) errRecover(err *error) { } default: - cn.bad = true + cn.setBad() panic(fmt.Sprintf("unknown error: %#v", e)) } // Any time we return ErrBadConn, we need to remember it since *Tx doesn't // mark the connection bad in database/sql. if *err == driver.ErrBadConn { - cn.bad = true + cn.setBad() } } diff --git a/vendor/github.com/lib/pq/go.mod b/vendor/github.com/lib/pq/go.mod index a33cf4c..b5a5639 100644 --- a/vendor/github.com/lib/pq/go.mod +++ b/vendor/github.com/lib/pq/go.mod @@ -1,14 +1,3 @@ module github.com/lib/pq go 1.13 - -require ( - github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 // indirect - github.com/jcmturner/gokrb5/v8 v8.2.0 - golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 // indirect - gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect - gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect - gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect - gopkg.in/jcmturner/gokrb5.v7 v7.5.0 - gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect -) diff --git a/vendor/github.com/lib/pq/krb.go b/vendor/github.com/lib/pq/krb.go index e98432f..408ec01 100644 --- a/vendor/github.com/lib/pq/krb.go +++ b/vendor/github.com/lib/pq/krb.go @@ -1,40 +1,27 @@ package pq -import ( - "net" - "strings" -) +// NewGSSFunc creates a GSS authentication provider, for use with +// RegisterGSSProvider. +type NewGSSFunc func() (GSS, error) -/* - * Basic GSSAPI interface to abstract Windows (SSPI) from Unix - * APIs within the driver - */ +var newGss NewGSSFunc -type Gss interface { +// RegisterGSSProvider registers a GSS authentication provider. For example, if +// you need to use Kerberos to authenticate with your server, add this to your +// main package: +// +// import "github.com/lib/pq/auth/kerberos" +// +// func init() { +// pq.RegisterGSSProvider(func() (pq.GSS, error) { return kerberos.NewGSS() }) +// } +func RegisterGSSProvider(newGssArg NewGSSFunc) { + newGss = newGssArg +} + +// GSS provides GSSAPI authentication (e.g., Kerberos). +type GSS interface { GetInitToken(host string, service string) ([]byte, error) GetInitTokenFromSpn(spn string) ([]byte, error) Continue(inToken []byte) (done bool, outToken []byte, err error) } - -/* - * Find the A record associated with a hostname - * In general, hostnames supplied to the driver should be - * canonicalized because the KDC usually only has one - * principal and not one per potential alias of a host. - */ -func canonicalizeHostname(host string) (string, error) { - canon := host - - name, err := net.LookupCNAME(host) - if err != nil { - return "", err - } - - name = strings.TrimSuffix(name, ".") - - if name != "" { - canon = name - } - - return canon, nil -} diff --git a/vendor/github.com/lib/pq/krb_unix.go b/vendor/github.com/lib/pq/krb_unix.go deleted file mode 100644 index b548366..0000000 --- a/vendor/github.com/lib/pq/krb_unix.go +++ /dev/null @@ -1,123 +0,0 @@ -// +build !windows - -package pq - -import ( - "fmt" - "os" - "os/user" - "strings" - - "github.com/jcmturner/gokrb5/v8/client" - "github.com/jcmturner/gokrb5/v8/config" - "github.com/jcmturner/gokrb5/v8/credentials" - "github.com/jcmturner/gokrb5/v8/spnego" -) - -/* - * UNIX Kerberos support, using jcmturner's pure-go - * implementation - */ - -// Implements the Gss interface -type gss struct { - cli *client.Client -} - -func NewGSS() (Gss, error) { - g := &gss{} - err := g.init() - - if err != nil { - return nil, err - } - - return g, nil -} - -func (g *gss) init() error { - cfgPath, ok := os.LookupEnv("KRB5_CONFIG") - if !ok { - cfgPath = "/etc/krb5.conf" - } - - cfg, err := config.Load(cfgPath) - if err != nil { - return err - } - - u, err := user.Current() - if err != nil { - return err - } - - ccpath := "/tmp/krb5cc_" + u.Uid - - ccname := os.Getenv("KRB5CCNAME") - if strings.HasPrefix(ccname, "FILE:") { - ccpath = strings.SplitN(ccname, ":", 2)[1] - } - - ccache, err := credentials.LoadCCache(ccpath) - if err != nil { - return err - } - - cl, err := client.NewFromCCache(ccache, cfg, client.DisablePAFXFAST(true)) - if err != nil { - return err - } - - cl.Login() - - g.cli = cl - - return nil -} - -func (g *gss) GetInitToken(host string, service string) ([]byte, error) { - - // Resolve the hostname down to an 'A' record, if required (usually, it is) - if g.cli.Config.LibDefaults.DNSCanonicalizeHostname { - var err error - host, err = canonicalizeHostname(host) - if err != nil { - return nil, err - } - } - - spn := service + "/" + host - - return g.GetInitTokenFromSpn(spn) -} - -func (g *gss) GetInitTokenFromSpn(spn string) ([]byte, error) { - s := spnego.SPNEGOClient(g.cli, spn) - - st, err := s.InitSecContext() - if err != nil { - return nil, fmt.Errorf("kerberos error (InitSecContext): %s", err.Error()) - } - - b, err := st.Marshal() - if err != nil { - return nil, fmt.Errorf("kerberos error (Marshaling token): %s", err.Error()) - } - - return b, nil -} - -func (g *gss) Continue(inToken []byte) (done bool, outToken []byte, err error) { - t := &spnego.SPNEGOToken{} - err = t.Unmarshal(inToken) - if err != nil { - return true, nil, fmt.Errorf("kerberos error (Unmarshaling token): %s", err.Error()) - } - - state := t.NegTokenResp.State() - if state != spnego.NegStateAcceptCompleted { - return true, nil, fmt.Errorf("kerberos: expected state 'Completed' - got %d", state) - } - - return true, nil, nil -} diff --git a/vendor/github.com/lib/pq/krb_windows.go b/vendor/github.com/lib/pq/krb_windows.go deleted file mode 100644 index 71e328e..0000000 --- a/vendor/github.com/lib/pq/krb_windows.go +++ /dev/null @@ -1,61 +0,0 @@ -// +build windows - -package pq - -import ( - "github.com/alexbrainman/sspi" - "github.com/alexbrainman/sspi/negotiate" -) - -type gss struct { - creds *sspi.Credentials - ctx *negotiate.ClientContext -} - -func NewGSS() (Gss, error) { - g := &gss{} - err := g.init() - - if err != nil { - return nil, err - } - - return g, nil -} - -func (g *gss) init() error { - creds, err := negotiate.AcquireCurrentUserCredentials() - if err != nil { - return err - } - - g.creds = creds - return nil -} - -func (g *gss) GetInitToken(host string, service string) ([]byte, error) { - - host, err := canonicalizeHostname(host) - if err != nil { - return nil, err - } - - spn := service + "/" + host - - return g.GetInitTokenFromSpn(spn) -} - -func (g *gss) GetInitTokenFromSpn(spn string) ([]byte, error) { - ctx, token, err := negotiate.NewClientContext(g.creds, spn) - if err != nil { - return nil, err - } - - g.ctx = ctx - - return token, nil -} - -func (g *gss) Continue(inToken []byte) (done bool, outToken []byte, err error) { - return g.ctx.Update(inToken) -} diff --git a/vendor/github.com/markbates/pkger/README.md b/vendor/github.com/markbates/pkger/README.md index 72159eb..32215ea 100644 --- a/vendor/github.com/markbates/pkger/README.md +++ b/vendor/github.com/markbates/pkger/README.md @@ -24,9 +24,10 @@ Paths: * Packages can specified in at the beginning of a path with a `:` seperator. github.com/markbates/pkger:/cmd/pkger/main.go * There are no relative paths. All paths are absolute to the modules root. +* Fully-qualified paths are embedded into the metadata of your static assets. If this behavior is undesirable, a preference is to build in a containerized environ, like docker, where the path strings are not ex-filtrating data about your development environment. ``` -"github.com/gobuffalo/buffalo:/go.mod" => $GOPATH/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod +"github.com/gobuffalo/buffalo:/go.mod" => /go/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod ``` ## CLI @@ -53,7 +54,7 @@ package <.> // Pkger stuff here ``` -The `-o` flag can be used specify the directory of the `pkged.go` file. +The `-o` flag can be used to specify the directory of the `pkged.go` file. ```bash $ pkger -o cmd/reader @@ -284,26 +285,26 @@ $ pkger parse ".": [ { "file": { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz", "Path": { "Pkg": "app", "Name": "/foo/bar/baz" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", "ImportPath": "app", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "main" } }, "pos": { - "Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", + "Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", "Offset": 629, "Line": 47, "Column": 27 @@ -313,26 +314,26 @@ $ pkger parse }, { "file": { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt", "Path": { "Pkg": "app", "Name": "/foo/bar/baz/biz.txt" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", "ImportPath": "app", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "main" } }, "pos": { - "Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", + "Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", "Offset": 706, "Line": 51, "Column": 25 @@ -388,38 +389,38 @@ $ pkger list -json "ImportPath": "app", "Files": [ { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "Path": { "Pkg": "app", "Name": "/assets" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "ImportPath": "", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "assets" } }, { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css", "Path": { "Pkg": "app", "Name": "/assets/css" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "ImportPath": "", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "assets" diff --git a/vendor/github.com/markbates/pkger/here/here.go b/vendor/github.com/markbates/pkger/here/here.go new file mode 100644 index 0000000..f87a061 --- /dev/null +++ b/vendor/github.com/markbates/pkger/here/here.go @@ -0,0 +1,14 @@ +package here + +import ( + "github.com/gobuffalo/here" +) + +type Info = here.Info +type Module = here.Module +type Path = here.Path + +var Here = here.New() +var Dir = Here.Dir +var Package = Here.Package +var Current = Here.Current diff --git a/vendor/github.com/markbates/pkger/internal/maps/files.go b/vendor/github.com/markbates/pkger/internal/maps/files.go index fd32fff..3b3b6ac 100644 --- a/vendor/github.com/markbates/pkger/internal/maps/files.go +++ b/vendor/github.com/markbates/pkger/internal/maps/files.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/internal/maps/infos.go b/vendor/github.com/markbates/pkger/internal/maps/infos.go index cfc0604..0eed02f 100644 --- a/vendor/github.com/markbates/pkger/internal/maps/infos.go +++ b/vendor/github.com/markbates/pkger/internal/maps/infos.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) // Infos wraps sync.Map and uses the following types: diff --git a/vendor/github.com/markbates/pkger/pkger.go b/vendor/github.com/markbates/pkger/pkger.go index 96d1c32..5f56a51 100644 --- a/vendor/github.com/markbates/pkger/pkger.go +++ b/vendor/github.com/markbates/pkger/pkger.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" "github.com/markbates/pkger/pkging/stdos" ) diff --git a/vendor/github.com/markbates/pkger/pkging/file.go b/vendor/github.com/markbates/pkger/pkging/file.go index 6d49cca..c7d12a1 100644 --- a/vendor/github.com/markbates/pkger/pkging/file.go +++ b/vendor/github.com/markbates/pkger/pkging/file.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type File interface { diff --git a/vendor/github.com/markbates/pkger/pkging/pkger.go b/vendor/github.com/markbates/pkger/pkging/pkger.go index 4a7a2fa..b2076f6 100644 --- a/vendor/github.com/markbates/pkger/pkging/pkger.go +++ b/vendor/github.com/markbates/pkger/pkging/pkger.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type Pkger interface { diff --git a/vendor/github.com/markbates/pkger/pkging/stdos/file.go b/vendor/github.com/markbates/pkger/pkging/stdos/file.go index 51559f8..35845cf 100644 --- a/vendor/github.com/markbates/pkger/pkging/stdos/file.go +++ b/vendor/github.com/markbates/pkger/pkging/stdos/file.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go b/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go index 30481ea..b811702 100644 --- a/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go +++ b/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/maps" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/pkging/wrap.go b/vendor/github.com/markbates/pkger/pkging/wrap.go index dee4b0a..438f955 100644 --- a/vendor/github.com/markbates/pkger/pkging/wrap.go +++ b/vendor/github.com/markbates/pkger/pkging/wrap.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) func Wrap(parent, with Pkger) Pkger { diff --git a/vendor/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go index b9e9363..41215d7 100644 --- a/vendor/github.com/mattn/go-colorable/colorable_windows.go +++ b/vendor/github.com/mattn/go-colorable/colorable_windows.go @@ -10,6 +10,7 @@ import ( "os" "strconv" "strings" + "sync" "syscall" "unsafe" @@ -27,6 +28,7 @@ const ( backgroundRed = 0x40 backgroundIntensity = 0x80 backgroundMask = (backgroundRed | backgroundBlue | backgroundGreen | backgroundIntensity) + commonLvbUnderscore = 0x8000 cENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x4 ) @@ -93,6 +95,7 @@ type Writer struct { oldattr word oldpos coord rest bytes.Buffer + mutex sync.Mutex } // NewColorable returns new instance of Writer which handles escape sequence from File. @@ -432,6 +435,8 @@ func atoiWithDefault(s string, def int) (int, error) { // Write writes data on console func (w *Writer) Write(data []byte) (n int, err error) { + w.mutex.Lock() + defer w.mutex.Unlock() var csbi consoleScreenBufferInfo procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi))) @@ -683,14 +688,19 @@ loop: switch { case n == 0 || n == 100: attr = w.oldattr - case 1 <= n && n <= 5: + case n == 4: + attr |= commonLvbUnderscore + case (1 <= n && n <= 3) || n == 5: attr |= foregroundIntensity - case n == 7: - attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4) - case n == 22 || n == 25: - attr |= foregroundIntensity - case n == 27: - attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4) + case n == 7 || n == 27: + attr = + (attr &^ (foregroundMask | backgroundMask)) | + ((attr & foregroundMask) << 4) | + ((attr & backgroundMask) >> 4) + case n == 22: + attr &^= foregroundIntensity + case n == 24: + attr &^= commonLvbUnderscore case 30 <= n && n <= 37: attr &= backgroundMask if (n-30)&1 != 0 { @@ -709,7 +719,7 @@ loop: n256setup() } attr &= backgroundMask - attr |= n256foreAttr[n256] + attr |= n256foreAttr[n256%len(n256foreAttr)] i += 2 } } else if len(token) == 5 && token[i+1] == "2" { @@ -751,7 +761,7 @@ loop: n256setup() } attr &= foregroundMask - attr |= n256backAttr[n256] + attr |= n256backAttr[n256%len(n256backAttr)] i += 2 } } else if len(token) == 5 && token[i+1] == "2" { diff --git a/vendor/github.com/valyala/fasttemplate/go.mod b/vendor/github.com/valyala/fasttemplate/go.mod index 6015c4b..37a50e2 100644 --- a/vendor/github.com/valyala/fasttemplate/go.mod +++ b/vendor/github.com/valyala/fasttemplate/go.mod @@ -1,3 +1,5 @@ module github.com/valyala/fasttemplate +go 1.12 + require github.com/valyala/bytebufferpool v1.0.0 diff --git a/vendor/github.com/valyala/fasttemplate/template.go b/vendor/github.com/valyala/fasttemplate/template.go index 9120920..1862001 100644 --- a/vendor/github.com/valyala/fasttemplate/template.go +++ b/vendor/github.com/valyala/fasttemplate/template.go @@ -9,8 +9,9 @@ package fasttemplate import ( "bytes" "fmt" - "github.com/valyala/bytebufferpool" "io" + + "github.com/valyala/bytebufferpool" ) // ExecuteFunc calls f on each template tag (placeholder) occurrence. @@ -49,6 +50,9 @@ func ExecuteFunc(template, startTag, endTag string, w io.Writer, f TagFunc) (int ni, err = f(w, unsafeBytes2String(s[:n])) nn += int64(ni) + if err != nil { + return nn, err + } s = s[n+len(b):] } ni, err = w.Write(s) @@ -73,6 +77,22 @@ func Execute(template, startTag, endTag string, w io.Writer, m map[string]interf return ExecuteFunc(template, startTag, endTag, w, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) }) } +// ExecuteStd works the same way as Execute, but keeps the unknown placeholders. +// This can be used as a drop-in replacement for strings.Replacer +// +// Substitution map m may contain values with the following types: +// * []byte - the fastest value type +// * string - convenient value type +// * TagFunc - flexible value type +// +// Returns the number of bytes written to w. +// +// This function is optimized for constantly changing templates. +// Use Template.ExecuteStd for frozen templates. +func ExecuteStd(template, startTag, endTag string, w io.Writer, m map[string]interface{}) (int64, error) { + return ExecuteFunc(template, startTag, endTag, w, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, startTag, endTag, tag, m) }) +} + // ExecuteFuncString calls f on each template tag (placeholder) occurrence // and substitutes it with the data written to TagFunc's w. // @@ -81,19 +101,32 @@ func Execute(template, startTag, endTag string, w io.Writer, m map[string]interf // This function is optimized for constantly changing templates. // Use Template.ExecuteFuncString for frozen templates. func ExecuteFuncString(template, startTag, endTag string, f TagFunc) string { + s, err := ExecuteFuncStringWithErr(template, startTag, endTag, f) + if err != nil { + panic(fmt.Sprintf("unexpected error: %s", err)) + } + return s +} + +// ExecuteFuncStringWithErr is nearly the same as ExecuteFuncString +// but when f returns an error, ExecuteFuncStringWithErr won't panic like ExecuteFuncString +// it just returns an empty string and the error f returned +func ExecuteFuncStringWithErr(template, startTag, endTag string, f TagFunc) (string, error) { tagsCount := bytes.Count(unsafeString2Bytes(template), unsafeString2Bytes(startTag)) if tagsCount == 0 { - return template + return template, nil } bb := byteBufferPool.Get() if _, err := ExecuteFunc(template, startTag, endTag, bb, f); err != nil { - panic(fmt.Sprintf("unexpected error: %s", err)) + bb.Reset() + byteBufferPool.Put(bb) + return "", err } s := string(bb.B) bb.Reset() byteBufferPool.Put(bb) - return s + return s, nil } var byteBufferPool bytebufferpool.Pool @@ -112,6 +145,20 @@ func ExecuteString(template, startTag, endTag string, m map[string]interface{}) return ExecuteFuncString(template, startTag, endTag, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) }) } +// ExecuteStringStd works the same way as ExecuteString, but keeps the unknown placeholders. +// This can be used as a drop-in replacement for strings.Replacer +// +// Substitution map m may contain values with the following types: +// * []byte - the fastest value type +// * string - convenient value type +// * TagFunc - flexible value type +// +// This function is optimized for constantly changing templates. +// Use Template.ExecuteStringStd for frozen templates. +func ExecuteStringStd(template, startTag, endTag string, m map[string]interface{}) string { + return ExecuteFuncString(template, startTag, endTag, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, startTag, endTag, tag, m) }) +} + // Template implements simple template engine, which can be used for fast // tags' (aka placeholders) substitution. type Template struct { @@ -267,6 +314,19 @@ func (t *Template) Execute(w io.Writer, m map[string]interface{}) (int64, error) return t.ExecuteFunc(w, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) }) } +// ExecuteStd works the same way as Execute, but keeps the unknown placeholders. +// This can be used as a drop-in replacement for strings.Replacer +// +// Substitution map m may contain values with the following types: +// * []byte - the fastest value type +// * string - convenient value type +// * TagFunc - flexible value type +// +// Returns the number of bytes written to w. +func (t *Template) ExecuteStd(w io.Writer, m map[string]interface{}) (int64, error) { + return t.ExecuteFunc(w, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, t.startTag, t.endTag, tag, m) }) +} + // ExecuteFuncString calls f on each template tag (placeholder) occurrence // and substitutes it with the data written to TagFunc's w. // @@ -275,14 +335,31 @@ func (t *Template) Execute(w io.Writer, m map[string]interface{}) (int64, error) // This function is optimized for frozen templates. // Use ExecuteFuncString for constantly changing templates. func (t *Template) ExecuteFuncString(f TagFunc) string { + s, err := t.ExecuteFuncStringWithErr(f) + if err != nil { + panic(fmt.Sprintf("unexpected error: %s", err)) + } + return s +} + +// ExecuteFuncStringWithErr calls f on each template tag (placeholder) occurrence +// and substitutes it with the data written to TagFunc's w. +// +// Returns the resulting string. +// +// This function is optimized for frozen templates. +// Use ExecuteFuncString for constantly changing templates. +func (t *Template) ExecuteFuncStringWithErr(f TagFunc) (string, error) { bb := t.byteBufferPool.Get() if _, err := t.ExecuteFunc(bb, f); err != nil { - panic(fmt.Sprintf("unexpected error: %s", err)) + bb.Reset() + t.byteBufferPool.Put(bb) + return "", err } s := string(bb.Bytes()) bb.Reset() t.byteBufferPool.Put(bb) - return s + return s, nil } // ExecuteString substitutes template tags (placeholders) with the corresponding @@ -299,6 +376,20 @@ func (t *Template) ExecuteString(m map[string]interface{}) string { return t.ExecuteFuncString(func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) }) } +// ExecuteStringStd works the same way as ExecuteString, but keeps the unknown placeholders. +// This can be used as a drop-in replacement for strings.Replacer +// +// Substitution map m may contain values with the following types: +// * []byte - the fastest value type +// * string - convenient value type +// * TagFunc - flexible value type +// +// This function is optimized for frozen templates. +// Use ExecuteStringStd for constantly changing templates. +func (t *Template) ExecuteStringStd(m map[string]interface{}) string { + return t.ExecuteFuncString(func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, t.startTag, t.endTag, tag, m) }) +} + func stdTagFunc(w io.Writer, tag string, m map[string]interface{}) (int, error) { v := m[tag] if v == nil { @@ -315,3 +406,32 @@ func stdTagFunc(w io.Writer, tag string, m map[string]interface{}) (int, error) panic(fmt.Sprintf("tag=%q contains unexpected value type=%#v. Expected []byte, string or TagFunc", tag, v)) } } + +func keepUnknownTagFunc(w io.Writer, startTag, endTag, tag string, m map[string]interface{}) (int, error) { + v, ok := m[tag] + if !ok { + if _, err := w.Write(unsafeString2Bytes(startTag)); err != nil { + return 0, err + } + if _, err := w.Write(unsafeString2Bytes(tag)); err != nil { + return 0, err + } + if _, err := w.Write(unsafeString2Bytes(endTag)); err != nil { + return 0, err + } + return len(startTag) + len(tag) + len(endTag), nil + } + if v == nil { + return 0, nil + } + switch value := v.(type) { + case []byte: + return w.Write(value) + case string: + return w.Write([]byte(value)) + case TagFunc: + return value(w, tag) + default: + panic(fmt.Sprintf("tag=%q contains unexpected value type=%#v. Expected []byte, string or TagFunc", tag, v)) + } +} diff --git a/vendor/github.com/valyala/fasttemplate/unsafe.go b/vendor/github.com/valyala/fasttemplate/unsafe.go index 0498248..1020ca3 100644 --- a/vendor/github.com/valyala/fasttemplate/unsafe.go +++ b/vendor/github.com/valyala/fasttemplate/unsafe.go @@ -11,12 +11,11 @@ func unsafeBytes2String(b []byte) string { return *(*string)(unsafe.Pointer(&b)) } -func unsafeString2Bytes(s string) []byte { +func unsafeString2Bytes(s string) (b []byte) { sh := (*reflect.StringHeader)(unsafe.Pointer(&s)) - bh := reflect.SliceHeader{ - Data: sh.Data, - Len: sh.Len, - Cap: sh.Len, - } - return *(*[]byte)(unsafe.Pointer(&bh)) + bh := (*reflect.SliceHeader)(unsafe.Pointer(&b)) + bh.Data = sh.Data + bh.Cap = sh.Len + bh.Len = sh.Len + return b } diff --git a/vendor/golang.org/x/crypto/md4/md4.go b/vendor/golang.org/x/crypto/md4/md4.go deleted file mode 100644 index 59d3480..0000000 --- a/vendor/golang.org/x/crypto/md4/md4.go +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package md4 implements the MD4 hash algorithm as defined in RFC 1320. -// -// Deprecated: MD4 is cryptographically broken and should should only be used -// where compatibility with legacy systems, not security, is the goal. Instead, -// use a secure hash like SHA-256 (from crypto/sha256). -package md4 // import "golang.org/x/crypto/md4" - -import ( - "crypto" - "hash" -) - -func init() { - crypto.RegisterHash(crypto.MD4, New) -} - -// The size of an MD4 checksum in bytes. -const Size = 16 - -// The blocksize of MD4 in bytes. -const BlockSize = 64 - -const ( - _Chunk = 64 - _Init0 = 0x67452301 - _Init1 = 0xEFCDAB89 - _Init2 = 0x98BADCFE - _Init3 = 0x10325476 -) - -// digest represents the partial evaluation of a checksum. -type digest struct { - s [4]uint32 - x [_Chunk]byte - nx int - len uint64 -} - -func (d *digest) Reset() { - d.s[0] = _Init0 - d.s[1] = _Init1 - d.s[2] = _Init2 - d.s[3] = _Init3 - d.nx = 0 - d.len = 0 -} - -// New returns a new hash.Hash computing the MD4 checksum. -func New() hash.Hash { - d := new(digest) - d.Reset() - return d -} - -func (d *digest) Size() int { return Size } - -func (d *digest) BlockSize() int { return BlockSize } - -func (d *digest) Write(p []byte) (nn int, err error) { - nn = len(p) - d.len += uint64(nn) - if d.nx > 0 { - n := len(p) - if n > _Chunk-d.nx { - n = _Chunk - d.nx - } - for i := 0; i < n; i++ { - d.x[d.nx+i] = p[i] - } - d.nx += n - if d.nx == _Chunk { - _Block(d, d.x[0:]) - d.nx = 0 - } - p = p[n:] - } - n := _Block(d, p) - p = p[n:] - if len(p) > 0 { - d.nx = copy(d.x[:], p) - } - return -} - -func (d0 *digest) Sum(in []byte) []byte { - // Make a copy of d0, so that caller can keep writing and summing. - d := new(digest) - *d = *d0 - - // Padding. Add a 1 bit and 0 bits until 56 bytes mod 64. - len := d.len - var tmp [64]byte - tmp[0] = 0x80 - if len%64 < 56 { - d.Write(tmp[0 : 56-len%64]) - } else { - d.Write(tmp[0 : 64+56-len%64]) - } - - // Length in bits. - len <<= 3 - for i := uint(0); i < 8; i++ { - tmp[i] = byte(len >> (8 * i)) - } - d.Write(tmp[0:8]) - - if d.nx != 0 { - panic("d.nx != 0") - } - - for _, s := range d.s { - in = append(in, byte(s>>0)) - in = append(in, byte(s>>8)) - in = append(in, byte(s>>16)) - in = append(in, byte(s>>24)) - } - return in -} diff --git a/vendor/golang.org/x/crypto/md4/md4block.go b/vendor/golang.org/x/crypto/md4/md4block.go deleted file mode 100644 index 3fed475..0000000 --- a/vendor/golang.org/x/crypto/md4/md4block.go +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// MD4 block step. -// In its own file so that a faster assembly or C version -// can be substituted easily. - -package md4 - -var shift1 = []uint{3, 7, 11, 19} -var shift2 = []uint{3, 5, 9, 13} -var shift3 = []uint{3, 9, 11, 15} - -var xIndex2 = []uint{0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15} -var xIndex3 = []uint{0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15} - -func _Block(dig *digest, p []byte) int { - a := dig.s[0] - b := dig.s[1] - c := dig.s[2] - d := dig.s[3] - n := 0 - var X [16]uint32 - for len(p) >= _Chunk { - aa, bb, cc, dd := a, b, c, d - - j := 0 - for i := 0; i < 16; i++ { - X[i] = uint32(p[j]) | uint32(p[j+1])<<8 | uint32(p[j+2])<<16 | uint32(p[j+3])<<24 - j += 4 - } - - // If this needs to be made faster in the future, - // the usual trick is to unroll each of these - // loops by a factor of 4; that lets you replace - // the shift[] lookups with constants and, - // with suitable variable renaming in each - // unrolled body, delete the a, b, c, d = d, a, b, c - // (or you can let the optimizer do the renaming). - // - // The index variables are uint so that % by a power - // of two can be optimized easily by a compiler. - - // Round 1. - for i := uint(0); i < 16; i++ { - x := i - s := shift1[i%4] - f := ((c ^ d) & b) ^ d - a += f + X[x] - a = a<>(32-s) - a, b, c, d = d, a, b, c - } - - // Round 2. - for i := uint(0); i < 16; i++ { - x := xIndex2[i] - s := shift2[i%4] - g := (b & c) | (b & d) | (c & d) - a += g + X[x] + 0x5a827999 - a = a<>(32-s) - a, b, c, d = d, a, b, c - } - - // Round 3. - for i := uint(0); i < 16; i++ { - x := xIndex3[i] - s := shift3[i%4] - h := b ^ c ^ d - a += h + X[x] + 0x6ed9eba1 - a = a<>(32-s) - a, b, c, d = d, a, b, c - } - - a += aa - b += bb - c += cc - d += dd - - p = p[_Chunk:] - n += _Chunk - } - - dig.s[0] = a - dig.s[1] = b - dig.s[2] = c - dig.s[3] = d - return n -} diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go deleted file mode 100644 index 593f653..0000000 --- a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -/* -Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC -2898 / PKCS #5 v2.0. - -A key derivation function is useful when encrypting data based on a password -or any other not-fully-random data. It uses a pseudorandom function to derive -a secure encryption key based on the password. - -While v2.0 of the standard defines only one pseudorandom function to use, -HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved -Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To -choose, you can pass the `New` functions from the different SHA packages to -pbkdf2.Key. -*/ -package pbkdf2 // import "golang.org/x/crypto/pbkdf2" - -import ( - "crypto/hmac" - "hash" -) - -// Key derives a key from the password, salt and iteration count, returning a -// []byte of length keylen that can be used as cryptographic key. The key is -// derived based on the method described as PBKDF2 with the HMAC variant using -// the supplied hash function. -// -// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you -// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by -// doing: -// -// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New) -// -// Remember to get a good random salt. At least 8 bytes is recommended by the -// RFC. -// -// Using a higher iteration count will increase the cost of an exhaustive -// search but will also make derivation proportionally slower. -func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte { - prf := hmac.New(h, password) - hashLen := prf.Size() - numBlocks := (keyLen + hashLen - 1) / hashLen - - var buf [4]byte - dk := make([]byte, 0, numBlocks*hashLen) - U := make([]byte, hashLen) - for block := 1; block <= numBlocks; block++ { - // N.B.: || means concatenation, ^ means XOR - // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter - // U_1 = PRF(password, salt || uint(i)) - prf.Reset() - prf.Write(salt) - buf[0] = byte(block >> 24) - buf[1] = byte(block >> 16) - buf[2] = byte(block >> 8) - buf[3] = byte(block) - prf.Write(buf[:4]) - dk = prf.Sum(dk) - T := dk[len(dk)-hashLen:] - copy(U, T) - - // U_n = PRF(password, U_(n-1)) - for n := 2; n <= iter; n++ { - prf.Reset() - prf.Write(U) - U = U[:0] - U = prf.Sum(U) - for x := range U { - T[x] ^= U[x] - } - } - } - return dk[:keyLen] -} diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go index 2cd12fc..f91466f 100644 --- a/vendor/golang.org/x/net/html/parse.go +++ b/vendor/golang.org/x/net/html/parse.go @@ -728,7 +728,13 @@ func inHeadNoscriptIM(p *parser) bool { return inBodyIM(p) case a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Style: return inHeadIM(p) - case a.Head, a.Noscript: + case a.Head: + // Ignore the token. + return true + case a.Noscript: + // Don't let the tokenizer go into raw text mode even when a