diff --git a/go.mod b/go.mod index f4ee93da8f..814444273b 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/openshift/oc go 1.24.0 require ( + al.essio.dev/pkg/shellescape v1.6.0 github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f github.com/MakeNowJust/heredoc v1.0.0 github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 - github.com/alessio/shellescape v1.4.1 - github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa + github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e github.com/alicebob/sqlittle v1.4.0 github.com/apcera/gssapi v0.0.0-00010101000000-000000000000 github.com/aws/aws-sdk-go v1.55.7 diff --git a/go.sum b/go.sum index 9ab827a4e1..5a9e405569 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA= +al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f h1:x/RDwGRneK2/891S2o7KhZt3MhHMSCssoeDOfvolTMk= @@ -19,10 +21,8 @@ github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 h1:x8Brv0YNEe6 github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk= 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/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= -github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= -github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= -github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= +github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI= +github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/alicebob/sqlittle v1.4.0 h1:vgYt0nAjhdf/hg52MjKJ84g/uTzBPfrvI+VUBrIghxA= github.com/alicebob/sqlittle v1.4.0/go.mod h1:Co1L1qxHqCwf41puWhk2HOodojR0mcsAV4BIt8byZh8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= diff --git a/pkg/cli/admin/copytonode/copy_to_node.go b/pkg/cli/admin/copytonode/copy_to_node.go index 97528fb9b2..c50877d100 100644 --- a/pkg/cli/admin/copytonode/copy_to_node.go +++ b/pkg/cli/admin/copytonode/copy_to_node.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/alessio/shellescape" + "al.essio.dev/pkg/shellescape" "github.com/openshift/library-go/pkg/operator/resource/resourceread" "github.com/openshift/oc/pkg/cli/admin/pernodepod" corev1 "k8s.io/api/core/v1" diff --git a/vendor/github.com/alessio/shellescape/.gitignore b/vendor/al.essio.dev/pkg/shellescape/.gitignore similarity index 92% rename from vendor/github.com/alessio/shellescape/.gitignore rename to vendor/al.essio.dev/pkg/shellescape/.gitignore index 4ba7c2d137..657fca3f9f 100644 --- a/vendor/github.com/alessio/shellescape/.gitignore +++ b/vendor/al.essio.dev/pkg/shellescape/.gitignore @@ -26,3 +26,7 @@ _testmain.go .idea/ escargs + +config.hcl + +.DS_Store diff --git a/vendor/github.com/alessio/shellescape/.golangci.yml b/vendor/al.essio.dev/pkg/shellescape/.golangci.yml similarity index 64% rename from vendor/github.com/alessio/shellescape/.golangci.yml rename to vendor/al.essio.dev/pkg/shellescape/.golangci.yml index cd4a17e442..05df54a228 100644 --- a/vendor/github.com/alessio/shellescape/.golangci.yml +++ b/vendor/al.essio.dev/pkg/shellescape/.golangci.yml @@ -6,31 +6,27 @@ linters: disable-all: true enable: - bodyclose - - deadcode - - depguard + - copyloopvar - dogsled + - gci - goconst - gocritic - gofmt - goimports - - golint - gosec - gosimple - govet - ineffassign - - interfacer - - maligned - misspell - prealloc - - scopelint + - revive - staticcheck - - structcheck - stylecheck - typecheck + - thelper - unconvert - unparam - unused - - misspell - wsl issues: @@ -47,18 +43,19 @@ issues: - text: "ST1003:" linters: - stylecheck - # FIXME: Disabled until golangci-lint updates stylecheck with this fix: - # https://github.com/dominikh/go-tools/issues/389 - - text: "ST1016:" + - path: "_test.go" linters: - - stylecheck + - wsl linters-settings: dogsled: max-blank-identifiers: 3 - maligned: - # print struct with more effective memory layout or not, false by default - suggest-new: true - -run: - tests: false + # define the import orders + gci: + sections: + # Standard section: captures all standard packages. + - standard + # Default section: catchall that is not standard or custom + - default + # linters that related to local tool, so they should be separated + - localmodule diff --git a/vendor/al.essio.dev/pkg/shellescape/.goreleaser.yml b/vendor/al.essio.dev/pkg/shellescape/.goreleaser.yml new file mode 100644 index 0000000000..0915eb869b --- /dev/null +++ b/vendor/al.essio.dev/pkg/shellescape/.goreleaser.yml @@ -0,0 +1,54 @@ +# This is an example goreleaser.yaml file with some sane defaults. +# Make sure to check the documentation at http://goreleaser.com +before: + hooks: + # You may remove this if you don't use go modules. + - go mod download + # you may remove this if you don't need go generate + - go generate ./... +builds: + - env: + - CGO_ENABLED=0 + - >- + {{- if eq .Os "darwin" }} + {{- if eq .Arch "amd64"}}CC=o64-clang{{- end }} + {{- if eq .Arch "arm64"}}CC=aarch64-apple-darwin20.2-clang{{- end }} + {{- end }} + {{- if eq .Os "windows" }} + {{- if eq .Arch "amd64" }}CC=x86_64-w64-mingw32-gcc{{- end }} + {{- end }} + main: ./cmd/escargs + goos: + - linux + - windows + - darwin + - freebsd + goarch: + - amd64 + - arm64 + - arm + goarm: + - 6 + - 7 + goamd64: + - v2 + - v3 + ignore: + - goos: darwin + goarch: 386 + - goos: linux + goarch: arm + goarm: 7 + - goarm: mips64 + - gomips: hardfloat + - goamd64: v4 +checksum: + name_template: 'checksums.txt' +snapshot: + name_template: "{{ .Tag }}-next" +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' diff --git a/vendor/github.com/alessio/shellescape/AUTHORS b/vendor/al.essio.dev/pkg/shellescape/AUTHORS similarity index 100% rename from vendor/github.com/alessio/shellescape/AUTHORS rename to vendor/al.essio.dev/pkg/shellescape/AUTHORS diff --git a/vendor/al.essio.dev/pkg/shellescape/CODE_OF_CONDUCT.md b/vendor/al.essio.dev/pkg/shellescape/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..6d84e87af4 --- /dev/null +++ b/vendor/al.essio.dev/pkg/shellescape/CODE_OF_CONDUCT.md @@ -0,0 +1,134 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official email address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +[alessio AT debian DOT org][contact]. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations +[contact]: mailto:alessio_AT_debian_DOT_org diff --git a/vendor/github.com/alessio/shellescape/LICENSE b/vendor/al.essio.dev/pkg/shellescape/LICENSE similarity index 100% rename from vendor/github.com/alessio/shellescape/LICENSE rename to vendor/al.essio.dev/pkg/shellescape/LICENSE diff --git a/vendor/al.essio.dev/pkg/shellescape/Makefile b/vendor/al.essio.dev/pkg/shellescape/Makefile new file mode 100644 index 0000000000..f92895c0f0 --- /dev/null +++ b/vendor/al.essio.dev/pkg/shellescape/Makefile @@ -0,0 +1,25 @@ + +#!/usr/bin/make -f + +VERSION := $(shell git describe) + +all: build + +build: + go build -a -v + +install: + go install ./cmd/escargs + +escargs: build + go build -v \ + -ldflags="-X 'main.version=$(VERSION)'" \ + ./cmd/escargs + +clean: + rm -rfv escargs + +uninstall: + rm -v $(shell go env GOPATH)/bin/escargs + +.PHONY: build clean install uninstall diff --git a/vendor/github.com/alessio/shellescape/README.md b/vendor/al.essio.dev/pkg/shellescape/README.md similarity index 85% rename from vendor/github.com/alessio/shellescape/README.md rename to vendor/al.essio.dev/pkg/shellescape/README.md index 910bb253b9..72dbc944cd 100644 --- a/vendor/github.com/alessio/shellescape/README.md +++ b/vendor/al.essio.dev/pkg/shellescape/README.md @@ -1,12 +1,13 @@ +# shellescape + ![Build](https://github.com/alessio/shellescape/workflows/Build/badge.svg) [![GoDoc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/alessio/shellescape?tab=overview) [![sourcegraph](https://sourcegraph.com/github.com/alessio/shellescape/-/badge.svg)](https://sourcegraph.com/github.com/alessio/shellescape) [![codecov](https://codecov.io/gh/alessio/shellescape/branch/master/graph/badge.svg)](https://codecov.io/gh/alessio/shellescape) -[![Coverage](https://gocover.io/_badge/github.com/alessio/shellescape)](https://gocover.io/github.com/alessio/shellescape) [![Go Report Card](https://goreportcard.com/badge/github.com/alessio/shellescape)](https://goreportcard.com/report/github.com/alessio/shellescape) -# shellescape Escape arbitrary strings for safe use as command line arguments. + ## Contents of the package This package provides the `shellescape.Quote()` function that returns a @@ -32,6 +33,7 @@ import ( func main() { fmt.Printf("ls -l %s\n", os.Args[1]) } + ``` _[See in Go Playground](https://play.golang.org/p/Wj2WoUfH_d)_ @@ -48,14 +50,15 @@ import ( "fmt" "os" - "gopkg.in/alessio/shellescape.v1" + "al.essio.dev/pkg/shellescape" ) func main() { fmt.Printf("ls -l %s\n", shellescape.Quote(os.Args[1])) } ``` -_[See in Go Playground](https://play.golang.org/p/HJ_CXgSrmp)_ +_[See in Go Playground](https://go.dev/play/p/GeguukpSUTk)_ ## The escargs utility -__escargs__ reads lines from the standard input and prints shell-escaped versions. Unlinke __xargs__, blank lines on the standard input are not discarded. + +__escargs__ reads lines from the standard input and prints shell-escaped versions. Unlike __xargs__, blank lines on the standard input are not discarded. diff --git a/vendor/github.com/alessio/shellescape/shellescape.go b/vendor/al.essio.dev/pkg/shellescape/shellescape.go similarity index 69% rename from vendor/github.com/alessio/shellescape/shellescape.go rename to vendor/al.essio.dev/pkg/shellescape/shellescape.go index dc34a556ae..fa1caf6443 100644 --- a/vendor/github.com/alessio/shellescape/shellescape.go +++ b/vendor/al.essio.dev/pkg/shellescape/shellescape.go @@ -6,7 +6,7 @@ POSIX shells. The original Python package which this work was inspired by can be found at https://pypi.python.org/pypi/shellescape. */ -package shellescape // "import gopkg.in/alessio/shellescape.v1" +package shellescape // "import al.essio.dev/pkg/shellescape" /* The functionality provided by shellescape.Quote could be helpful @@ -15,6 +15,7 @@ be appended to/used in the context of shell programs' command line arguments. */ import ( + "bytes" "regexp" "strings" "unicode" @@ -64,3 +65,24 @@ func StripUnsafe(s string) string { return -1 }, s) } + +// ScanTokens is a split function for a bufio.Scanner that returns each word of text, stripped +// of amy trailing end-of-text empty byte. +func ScanTokens(data []byte, atEOF bool) (advance int, token []byte, err error) { + // Return nothing if at end-of-file and no data passed. + if atEOF && len(data) == 0 { + return 0, nil, nil + } + + // Find the index of the input of a null character. + if i := bytes.IndexByte(data, '\x00'); i >= 0 { + return i + 1, data[0:i], nil + } + // If we're at EOF, we have a final, non-terminated line. Return it. + if atEOF { + return len(data), data, nil + } + + // Request more data. + return 0, nil, nil +} diff --git a/vendor/github.com/alessio/shellescape/.goreleaser.yml b/vendor/github.com/alessio/shellescape/.goreleaser.yml deleted file mode 100644 index 064c9374d7..0000000000 --- a/vendor/github.com/alessio/shellescape/.goreleaser.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This is an example goreleaser.yaml file with some sane defaults. -# Make sure to check the documentation at http://goreleaser.com -before: - hooks: - # You may remove this if you don't use go modules. - - go mod download - # you may remove this if you don't need go generate - - go generate ./... -builds: - - env: - - CGO_ENABLED=0 - main: ./cmd/escargs - goos: - - linux - - windows - - darwin -archives: - - replacements: - darwin: Darwin - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 -checksum: - name_template: 'checksums.txt' -snapshot: - name_template: "{{ .Tag }}-next" -changelog: - sort: asc - filters: - exclude: - - '^docs:' - - '^test:' diff --git a/vendor/github.com/alessio/shellescape/CODE_OF_CONDUCT.md b/vendor/github.com/alessio/shellescape/CODE_OF_CONDUCT.md deleted file mode 100644 index e8eda60620..0000000000 --- a/vendor/github.com/alessio/shellescape/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,76 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at alessio@debian.org. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/vendor/github.com/alexbrainman/sspi/internal/common/common.go b/vendor/github.com/alexbrainman/sspi/internal/common/common.go index 7ccf4d50a2..a5b64acd04 100644 --- a/vendor/github.com/alexbrainman/sspi/internal/common/common.go +++ b/vendor/github.com/alexbrainman/sspi/internal/common/common.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build windows // +build windows package common @@ -41,19 +42,34 @@ func BuildAuthIdentity(domain, username, password string) (*sspi.SEC_WINNT_AUTH_ } func UpdateContext(c *sspi.Context, dst, src []byte, targetName *uint16) (authCompleted bool, n int, err error) { - var inBuf, outBuf [1]sspi.SecBuffer + return UpdateContextWithChannelBindings(c, dst, src, nil, targetName) +} + +// UpdateContextWithChannelBindings performs SSPI context update with optional channel binding tokens. +func UpdateContextWithChannelBindings(c *sspi.Context, dst, src, channelBindings []byte, targetName *uint16) (authCompleted bool, n int, err error) { + var inBuf [2]sspi.SecBuffer + inBuf[0].Set(sspi.SECBUFFER_TOKEN, src) inBufs := &sspi.SecBufferDesc{ Version: sspi.SECBUFFER_VERSION, BuffersCount: 1, Buffers: &inBuf[0], } + + if len(channelBindings) > 0 { + // With channel bindings: TOKEN buffer + CHANNEL_BINDINGS buffer + inBuf[1].Set(sspi.SECBUFFER_CHANNEL_BINDINGS, channelBindings) + inBufs.BuffersCount = 2 + } + + var outBuf [1]sspi.SecBuffer 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: diff --git a/vendor/github.com/alexbrainman/sspi/syscall.go b/vendor/github.com/alexbrainman/sspi/syscall.go index 04660df2ae..27aa4f8473 100644 --- a/vendor/github.com/alexbrainman/sspi/syscall.go +++ b/vendor/github.com/alexbrainman/sspi/syscall.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build windows // +build windows package sspi @@ -96,19 +97,20 @@ type CredHandle struct { 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 + 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_CHANNEL_BINDINGS = 14 + SECBUFFER_READONLY = 0x80000000 + SECBUFFER_ATTRMASK = 0xf0000000 + SECBUFFER_VERSION = 0 + SECBUFFER_EMPTY = 0 ISC_REQ_DELEGATE = 1 ISC_REQ_MUTUAL_AUTH = 2 diff --git a/vendor/modules.txt b/vendor/modules.txt index 16b596ae6d..2f971c09b1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,6 @@ +# al.essio.dev/pkg/shellescape v1.6.0 +## explicit; go 1.18 +al.essio.dev/pkg/shellescape # github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f ## explicit github.com/AaronO/go-git-http @@ -26,10 +29,7 @@ github.com/Microsoft/go-winio/pkg/guid # github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 ## explicit github.com/RangelReale/osincli -# github.com/alessio/shellescape v1.4.1 -## explicit; go 1.14 -github.com/alessio/shellescape -# github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa +# github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e ## explicit; go 1.13 github.com/alexbrainman/sspi github.com/alexbrainman/sspi/internal/common