Skip to content

Commit 8d7653e

Browse files
authored
Merge pull request #426 from sigstore/dependabot/go_modules/github.com/hashicorp/go-plugin-1.4.8
chore(deps): Bump github.com/hashicorp/go-plugin from 1.4.6 to 1.4.8
2 parents 2bc604f + 6709d67 commit 8d7653e

File tree

7 files changed

+340
-8
lines changed

7 files changed

+340
-8
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/hashicorp/go-hclog v1.4.0
1919
github.com/hashicorp/go-immutable-radix v1.3.1
2020
github.com/hashicorp/go-multierror v1.1.1
21-
github.com/hashicorp/go-plugin v1.4.6
21+
github.com/hashicorp/go-plugin v1.4.8
2222
github.com/hashicorp/go-retryablehttp v0.7.1
2323
github.com/hashicorp/go-rootcerts v1.0.2
2424
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh
535535
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
536536
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
537537
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
538-
github.com/hashicorp/go-plugin v1.4.6 h1:MDV3UrKQBM3du3G7MApDGvOsMYy3JQJ4exhSoKBAeVA=
539-
github.com/hashicorp/go-plugin v1.4.6/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
538+
github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
539+
github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
540540
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
541541
github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ=
542542
github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

third_party/VENDOR-LICENSE/github.com/hashicorp/go-plugin/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## v1.4.8
2+
3+
BUG FIXES:
4+
5+
* Fix windows build: [[GH-227](https://github.com/hashicorp/go-plugin/pull/227)]
6+
7+
## v1.4.7
8+
9+
ENHANCEMENTS:
10+
11+
* More detailed error message on plugin start failure: [[GH-223](https://github.com/hashicorp/go-plugin/pull/223)]
12+
113
## v1.4.6
214

315
BUG FIXES:

third_party/VENDOR-LICENSE/github.com/hashicorp/go-plugin/client.go

+20-5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ import (
2626
"google.golang.org/grpc"
2727
)
2828

29+
const unrecognizedRemotePluginMessage = `Unrecognized remote plugin message: %s
30+
This usually means
31+
the plugin was not compiled for this architecture,
32+
the plugin is missing dynamic-link libraries necessary to run,
33+
the plugin is not executable by this process due to file permissions, or
34+
the plugin failed to negotiate the initial go-plugin protocol handshake
35+
%s`
36+
2937
// If this is 1, then we've called CleanupClients. This can be used
3038
// by plugin RPC implementations to change error behavior since you
3139
// can expected network connection errors at this point. This should be
@@ -473,7 +481,17 @@ func (c *Client) Kill() {
473481
c.l.Unlock()
474482
}
475483

476-
// Starts the underlying subprocess, communicating with it to negotiate
484+
// peTypes is a list of Portable Executable (PE) machine types from https://learn.microsoft.com/en-us/windows/win32/debug/pe-format
485+
// mapped to GOARCH types. It is not comprehensive, and only includes machine types that Go supports.
486+
var peTypes = map[uint16]string{
487+
0x14c: "386",
488+
0x1c0: "arm",
489+
0x6264: "loong64",
490+
0x8664: "amd64",
491+
0xaa64: "arm64",
492+
}
493+
494+
// Start the underlying subprocess, communicating with it to negotiate
477495
// a port for RPC connections, and returning the address to connect via RPC.
478496
//
479497
// This method is safe to call multiple times. Subsequent calls have no effect.
@@ -697,10 +715,7 @@ func (c *Client) Start() (addr net.Addr, err error) {
697715
line = strings.TrimSpace(line)
698716
parts := strings.SplitN(line, "|", 6)
699717
if len(parts) < 4 {
700-
err = fmt.Errorf(
701-
"Unrecognized remote plugin message: %s\n\n"+
702-
"This usually means that the plugin is either invalid or simply\n"+
703-
"needs to be recompiled to support the latest protocol.", line)
718+
err = fmt.Errorf(unrecognizedRemotePluginMessage, line, additionalNotesAboutCommand(cmd.Path))
704719
return
705720
}
706721

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
//go:build !windows
2+
// +build !windows
3+
4+
package plugin
5+
6+
import (
7+
"debug/elf"
8+
"debug/macho"
9+
"debug/pe"
10+
"fmt"
11+
"os"
12+
"os/user"
13+
"runtime"
14+
"strconv"
15+
"syscall"
16+
)
17+
18+
// additionalNotesAboutCommand tries to get additional information about a command that might help diagnose
19+
// why it won't run correctly. It runs as a best effort only.
20+
func additionalNotesAboutCommand(path string) string {
21+
notes := ""
22+
stat, err := os.Stat(path)
23+
if err != nil {
24+
return notes
25+
}
26+
27+
notes += "\nAdditional notes about plugin:\n"
28+
notes += fmt.Sprintf(" Path: %s\n", path)
29+
notes += fmt.Sprintf(" Mode: %s\n", stat.Mode())
30+
statT, ok := stat.Sys().(*syscall.Stat_t)
31+
if ok {
32+
currentUsername := "?"
33+
if u, err := user.LookupId(strconv.FormatUint(uint64(os.Getuid()), 10)); err == nil {
34+
currentUsername = u.Username
35+
}
36+
currentGroup := "?"
37+
if g, err := user.LookupGroupId(strconv.FormatUint(uint64(os.Getgid()), 10)); err == nil {
38+
currentGroup = g.Name
39+
}
40+
username := "?"
41+
if u, err := user.LookupId(strconv.FormatUint(uint64(statT.Uid), 10)); err == nil {
42+
username = u.Username
43+
}
44+
group := "?"
45+
if g, err := user.LookupGroupId(strconv.FormatUint(uint64(statT.Gid), 10)); err == nil {
46+
group = g.Name
47+
}
48+
notes += fmt.Sprintf(" Owner: %d [%s] (current: %d [%s])\n", statT.Uid, username, os.Getuid(), currentUsername)
49+
notes += fmt.Sprintf(" Group: %d [%s] (current: %d [%s])\n", statT.Gid, group, os.Getgid(), currentGroup)
50+
}
51+
52+
if elfFile, err := elf.Open(path); err == nil {
53+
notes += fmt.Sprintf(" ELF architecture: %s (current architecture: %s)\n", elfFile.Machine, runtime.GOARCH)
54+
} else if machoFile, err := macho.Open(path); err == nil {
55+
notes += fmt.Sprintf(" MachO architecture: %s (current architecture: %s)\n", machoFile.Cpu, runtime.GOARCH)
56+
} else if peFile, err := pe.Open(path); err == nil {
57+
machine, ok := peTypes[peFile.Machine]
58+
if !ok {
59+
machine = "unknown"
60+
}
61+
notes += fmt.Sprintf(" PE architecture: %s (current architecture: %s)\n", machine, runtime.GOARCH)
62+
}
63+
return notes
64+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//go:build windows
2+
// +build windows
3+
4+
package plugin
5+
6+
import (
7+
"debug/elf"
8+
"debug/macho"
9+
"debug/pe"
10+
"fmt"
11+
"os"
12+
"runtime"
13+
)
14+
15+
// additionalNotesAboutCommand tries to get additional information about a command that might help diagnose
16+
// why it won't run correctly. It runs as a best effort only.
17+
func additionalNotesAboutCommand(path string) string {
18+
notes := ""
19+
stat, err := os.Stat(path)
20+
if err != nil {
21+
return notes
22+
}
23+
24+
notes += "\nAdditional notes about plugin:\n"
25+
notes += fmt.Sprintf(" Path: %s\n", path)
26+
notes += fmt.Sprintf(" Mode: %s\n", stat.Mode())
27+
28+
if elfFile, err := elf.Open(path); err == nil {
29+
notes += fmt.Sprintf(" ELF architecture: %s (current architecture: %s)\n", elfFile.Machine, runtime.GOARCH)
30+
} else if machoFile, err := macho.Open(path); err == nil {
31+
notes += fmt.Sprintf(" MachO architecture: %s (current architecture: %s)\n", machoFile.Cpu, runtime.GOARCH)
32+
} else if peFile, err := pe.Open(path); err == nil {
33+
machine, ok := peTypes[peFile.Machine]
34+
if !ok {
35+
machine = "unknown"
36+
}
37+
notes += fmt.Sprintf(" PE architecture: %s (current architecture: %s)\n", machine, runtime.GOARCH)
38+
}
39+
return notes
40+
}

0 commit comments

Comments
 (0)