| 1 |
From: Roger Shimizu <[email protected]> |
| 2 |
Date: Sun, 12 Jul 2020 19:41:21 +0900 |
| 3 |
Subject: Revert "Adopt to new signature key and format" |
| 4 |
|
| 5 |
This reverts commit 432bc627bbcfc66207a9521abb897811cc42d0b7. |
| 6 |
--- |
| 7 |
infra/control/verify.go | 121 +++++++++++++++++++++++++++++++++++++++++++++--- |
| 8 |
1 file changed, 114 insertions(+), 7 deletions(-) |
| 9 |
|
| 10 |
diff --git a/infra/control/verify.go b/infra/control/verify.go |
| 11 |
index 84a1ae1..3aeab57 100644 |
| 12 |
--- a/infra/control/verify.go |
| 13 |
+++ b/infra/control/verify.go |
| 14 |
@@ -2,12 +2,106 @@ package control |
| 15 |
|
| 16 |
import ( |
| 17 |
"flag" |
| 18 |
+ "fmt" |
| 19 |
"os" |
| 20 |
+ "strings" |
| 21 |
+ |
| 22 |
+ "golang.org/x/crypto/openpgp" |
| 23 |
|
| 24 |
- "github.com/v2fly/VSign/signerVerify" |
| 25 |
"v2ray.com/core/common" |
| 26 |
) |
| 27 |
|
| 28 |
+var pubkey = []string{`-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 29 |
+ |
| 30 |
+mQENBFx4NlQBCADJyVwRUO/LzcnoHLWKppFQY4aTS+fH8k4Pf5nB3VR41v/3QZm1 |
| 31 |
+jBkuO1522KmBkPPuuYDAdOrE8Y8UVLfir5RxnZXF9Ke8SPq0zB+ruOHfv0xJUz8q |
| 32 |
+bcArsdXpDRxtrEbi7J81YOB/yITuY5kSYUA9v1TZWf7eSS6GIw/YF0Eo/gsbbpwQ |
| 33 |
+yon/Ue3xxxbZnWvfsluhPADomNwbJ5iTFeRClJqdACb/YqIEo2M2ttLE3QF2qrrL |
| 34 |
+SbzdTUtr3qjADIEWHoABcQ+Amx0sGnyiTJUGiL+4QwdIOLsh4RLq1MWgN+niw9Cl |
| 35 |
+cUQBPojZmHPPqIjNXr823TpZvkZOxuE9RSDjABEBAAG0I1YyUmF5IE9mZmljaWFs |
| 36 |
+IDxvZmZpY2lhbEB2MnJheS5jb20+iQFUBBMBCAA+FiEErWNIgUDlPuCCHb89lRmC |
| 37 |
+s2m2F+UFAlx4NlQCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ |
| 38 |
+lRmCs2m2F+Xvlgf8CenlUIj+abvtISSkHLi1qKPTIt8tzPxcYX1yUC3nkqaXW7eh |
| 39 |
++VTjZXU7y5rfelUBQchnEqqIfH4liH5t+yFoMeTntyo3bTgcj7BhjBwwB4lQspnb |
| 40 |
+AjiuLV95L6QbJoPVyJ1KlAC3X88QRlUDYy5ft0wTro1A4oLdgtbzWhiXKIAcedBt |
| 41 |
+zMjvX/qETtQvs15sF+HgF3/MHPjGH0I3gumIRMiIEE7vtaQvOZHknXlg552W+gmN |
| 42 |
+BVFr9uuLMPCD/+LB2uhGhjuEA8Jj3mqKtkyWSEkOd9losBbBrEo0wupEz1/Ahxga |
| 43 |
+h2X1Zd1etdDRsjl7JRt4Hf+vXV+kg/GfM6Gw5LkBDQRceDZUAQgArB8vjN/lwKte |
| 44 |
+vLjWEw7DaVbMC9R7RMYLSrdPTaQpBnFuQON3GOiIikRuwowl+K0HiZzojJwVq4yF |
| 45 |
+cGB8cBx9fT+zmAhPxLIDvY/mRb2BzsnpGgMlwydJZYLTTrPzbCXep9uzNXtBbcwd |
| 46 |
+aXLXWfTEoWmEVO1ZGuqI7X96cJvdhjzQAvkCpk+lgdJ9vo67aTBRu2d1YL6nd9lK |
| 47 |
+Oh4x43Cd2GNNpPOSdLxhISozImIGMFlrXn6riHXRVVcj+yVR/b9afsAm1MicDPtL |
| 48 |
+dWxCF7kZ/4u3rcLHAjCz5T/zoBn2S4MtISWzkPXkswz6fa9fHWCgblbl4uzUq7fl |
| 49 |
+3I8JvdGRfwARAQABiQE8BBgBCAAmFiEErWNIgUDlPuCCHb89lRmCs2m2F+UFAlx4 |
| 50 |
+NlQCGwwFCQPCZwAACgkQlRmCs2m2F+Vh1wf/TMCke/T18e//8KFmgKAeiLECpMxE |
| 51 |
+h6jZvfIMh5lN0YxmgKkw7T2UgYyqYJ4Wxm24iiNw2KUV/saltzsc5PoWMlcdpI8c |
| 52 |
+t7VNWbzHTgr2+UvigLgFpGG6G5GSlKVinXSZcgADN4F+7VMD+urycFPEmLYSTmlE |
| 53 |
+DKz+NrHmeKh08palwJEZnuK4vBg6WREHLcrborGgyZUxLu/ehbGc3QqMBbvupr3m |
| 54 |
+QiRC90xqxDa1u+q6cbFdiOdaKMzvibT9OnC7RanZ3uk+D0Jgs7yKuwHSNwNX6C3C |
| 55 |
+NTaV4BNont/v+X9ycP3NhqlMN8yONnSl66O19RBbdbP6M+UCr96mRiu0YA== |
| 56 |
+=T8XU |
| 57 |
+-----END PGP PUBLIC KEY BLOCK----- |
| 58 |
+`, `-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 59 |
+Comment: GPGTools - https://gpgtools.org |
| 60 |
+ |
| 61 |
+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 |
| 108 |
+=xv/V |
| 109 |
+-----END PGP PUBLIC KEY BLOCK----- |
| 110 |
+`} |
| 111 |
+ |
| 112 |
+func firstIdentity(m map[string]*openpgp.Identity) string { |
| 113 |
+ for k := range m { |
| 114 |
+ return k |
| 115 |
+ } |
| 116 |
+ return "" |
| 117 |
+} |
| 118 |
+ |
| 119 |
type VerifyCommand struct{} |
| 120 |
|
| 121 |
func (c *VerifyCommand) Name() string { |
| 122 |
@@ -18,7 +112,7 @@ func (c *VerifyCommand) Description() Description { |
| 123 |
return Description{ |
| 124 |
Short: "Verify if a binary is officially signed.", |
| 125 |
Usage: []string{ |
| 126 |
- "v2ctl verify --sig=<sig-file> file...", |
| 127 |
+ "v2ctl verify [--sig=<sig-file>] file", |
| 128 |
"Verify the file officially signed by V2Ray.", |
| 129 |
}, |
| 130 |
} |
| 131 |
@@ -39,7 +133,12 @@ func (c *VerifyCommand) Execute(args []string) error { |
| 132 |
} |
| 133 |
|
| 134 |
if *sigFile == "" { |
| 135 |
- return newError("empty signature path.") |
| 136 |
+ *sigFile = target + ".sig" |
| 137 |
+ } |
| 138 |
+ |
| 139 |
+ targetReader, err := os.Open(os.ExpandEnv(target)) |
| 140 |
+ if err != nil { |
| 141 |
+ return newError("failed to open file: ", target).Base(err) |
| 142 |
} |
| 143 |
|
| 144 |
sigReader, err := os.Open(os.ExpandEnv(*sigFile)) |
| 145 |
@@ -47,15 +146,23 @@ func (c *VerifyCommand) Execute(args []string) error { |
| 146 |
return newError("failed to open file ", *sigFile).Base(err) |
| 147 |
} |
| 148 |
|
| 149 |
- files := fs.Args() |
| 150 |
+ for _, key := range pubkey { |
| 151 |
+ keyring, err := openpgp.ReadArmoredKeyRing(strings.NewReader(key)) |
| 152 |
+ if err != nil { |
| 153 |
+ return newError("failed to create keyring").Base(err) |
| 154 |
+ } |
| 155 |
|
| 156 |
- err = signerVerify.OutputAndJudge(signerVerify.CheckSignaturesV2Fly(sigReader, files)) |
| 157 |
+ entity, err := openpgp.CheckDetachedSignature(keyring, targetReader, sigReader) |
| 158 |
+ if err != nil { |
| 159 |
+ fmt.Println("failed to verify, try another key: ", err) |
| 160 |
+ continue |
| 161 |
+ } |
| 162 |
|
| 163 |
- if err == nil { |
| 164 |
+ fmt.Println("Signed by:", firstIdentity(entity.Identities)) |
| 165 |
return nil |
| 166 |
} |
| 167 |
|
| 168 |
- return newError("file is not officially signed by V2Ray").Base(err) |
| 169 |
+ return newError("file is not officially signed by V2Ray") |
| 170 |
} |
| 171 |
|
| 172 |
func init() { |