Merge 4c67666937 into f9e48803a5

create sops
Bump browserify-sign from 4.2.1 to 4.2.2 in /vad
2025-02-03 15:48:40 +00:00 · 2023-12-29 16:03:43 +00:00 · 2023-12-30 00:40:41 +09:00 · 2023-11-09 08:21:57 +00:00
7 changed files with 139 additions and 19 deletions
--- a/sops/.enc.env
+++ b/sops/.enc.env
@ -0,0 +1,10 @@
+foo=ENC[AES256_GCM,data:ONcp,iv:6DJ9zWBjWrR5mcI/O6r1O9G9RVxlHAGaK2o1NLxzCrQ=,tag:0c4nN3+W7qAW6H+yczPmXQ==,type:str]
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdXE3UUpPTVZUcHJYNENk\nazBkbWd4MjBXalYwM0k4T1llVmFUR3RPNzM0CjVjSTAyTXMwTVJ6N0hBYVNrOW43\ncmYvMTZFcGI2eE5HOC9HR1ZFOFIvdW8KLS0tIDMvLzJGRExGdGt0S1NVbkxxS3Qx\nUXRIb0ZRUmQwRzA4WkRnMkhLY3gwbWcKYYI+JlWL3aIDr3zl4QaISsViVlvVZQOM\nIfQJbQVdErBdHzXT+3Fn0CCb16qDGSi0SqQT6sv+QJCm+fASgVKRDA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_recipient=age120pknt3u4y9n2dqevnd57ns4eudv6kuajkjzr05zlu6wqtz59dyq7vv7wz
+sops_lastmodified=2023-12-29T14:42:01Z
+sops_mac=ENC[AES256_GCM,data:+4eBeyODR0TgNO/8sl7H3L0v14ria7UHL6BGd1BmODMabaDHBuYGRVxf/WJ6A3E08LNnTa6xPQ9A8UFRdE2O2h0St9IJ2ux5UCfgKlzR3cuKDyWuDeKgIVu/fu/ZoQj5810r4o9BuYMWtEYbCT2+tyE8LQ2MsiX3YN3wyo9LcfI=,iv:7H6afJ8izS8Yy/urmqEJwFy/25bReiJMr5qawsDvwcg=,tag:6ONR8UrpRjqTMEic4MnHag==,type:str]
+sops_pgp__list_0__map_created_at=2023-12-29T14:38:36Z
+sops_pgp__list_0__map_enc=-----BEGIN PGP MESSAGE-----\n\nhF4DYq721CgpBoASAQdABcljEOTmLqts0k/XfzeIutwNFncatx7uKL8IqvPXjX4w\nSrCy5nVYOTDgTlx6ne4D+B56LsurZMR5YhRwvgUUH9HZ4cz0W9CxiUp41fMJBkSN\n0l4BIHr6YKPYN9DsZSZMqyGe8LQ6nqjMsDT8m4fFy/8Tv+dwM+AI8+bdEu+XE5mR\ncuy2RQlVzpGFT62995blznAW+cLk25tGVdV77vW2/4EjZriPVN4+QeEB4+vMBXoS\n=IDci\n-----END PGP MESSAGE-----
+sops_pgp__list_0__map_fp=4818145E783E2A4A04E816A479807D08C6EF6460
+sops_unencrypted_suffix=_unencrypted
+sops_version=3.8.1
--- a/sops/.gitattributes
+++ b/sops/.gitattributes
@ -0,0 +1,3 @@
+*.enc.env diff=sops
+*.enc.json diff=sops
+*.enc.yml diff=sops
--- a/sops/.sops.yaml
+++ b/sops/.sops.yaml
@ -0,0 +1,3 @@
+creation_rules:
+  - age: age120pknt3u4y9n2dqevnd57ns4eudv6kuajkjzr05zlu6wqtz59dyq7vv7wz
+    pgp: 4818145E783E2A4A04E816A479807D08C6EF6460
--- a/sops/Makefile
+++ b/sops/Makefile
@ -0,0 +1,4 @@
+.PHONY: prepare
+prepare:
+	brew install age sops
+	git config diff.sops.textconv "sops -d"
--- a/sops/credentials.enc.yml
+++ b/sops/credentials.enc.yml
@ -0,0 +1,32 @@
+foo: ENC[AES256_GCM,data:VLhD,iv:6AXZwHtnl9AvgQsIANVH/AUqjmQiBO2T8VEnWt3p1r0=,tag:PkJZgWe2WDBRi3E57PGumA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age120pknt3u4y9n2dqevnd57ns4eudv6kuajkjzr05zlu6wqtz59dyq7vv7wz
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQbTk3QnNRdmgyTXpHMUt1
+            QVRyQkd2Y3NpYlNYZm12Q01qV2x3bkhVNG5vCmlMVjBQRkxkbjFzSWVzVzg2UitV
+            T2QvNXkzcVRsejVMK2pHc2d5WHNsK0kKLS0tIFhOWXlPM2hPYkhTVXJGV2d5N1gy
+            MnBTWEMvcUkrMllqZnhHbjkvQXQ0S3MKNoYzWc+ezxaIKWbNz3FeBj64v6ExcTZS
+            da833T2kOMwIxS6DtNS7Bs85XJqmbGFMlhjVDWHJTWkTctKca+3row==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-12-29T15:01:41Z"
+    mac: ENC[AES256_GCM,data:PV+gFH0rk422HRUIeen3JAATJkoxNQ+58nPk874mOx4BPEBzmDTr7QCOexucmTQy7XS6oF++DoBqX1vUCIeAd8hIAnlpDnh2tfrB+vHb3iODlzVYwsCQkt0KaRDhqR4Z4UWfREVD9gI+y1/jFqICOajenx35BlP5F29hMMyz3+o=,iv:Oz+FKTOMSXJUl8AnqelQ5GiedS9gwHHVaWDEBSBW2qU=,tag:dtiibn305329MDsFwdOcEQ==,type:str]
+    pgp:
+        - created_at: "2023-12-29T15:01:41Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DYq721CgpBoASAQdAoPFI83rL1ULwOJZpyph+6b2iiYbHqg5G181+9MS9eS4w
+            WhbXVKzDKN/lSPyrKr7Z/DHEXou+oXx8R8SGxDxq62l/ZFdVflklBJ1Lq5ZFrpHN
+            0l4Bhq99rnlRossFPTyJTOyEgJbGD/wGnEF/uu5q+3AnThtPsEEZnts8vtZndxuT
+            0/SBG/9KC6tf+Hqj/8CAGA78fMrHuUIhzSFmunNWQ5XQzWna8Sl6paPLMKDbmq79
+            =sgZT
+            -----END PGP MESSAGE-----
+          fp: 4818145E783E2A4A04E816A479807D08C6EF6460
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1
--- a/sops/jwk.enc.json
+++ b/sops/jwk.enc.json
@ -0,0 +1,33 @@
+{
+  "alg": "ENC[AES256_GCM,data:sxlfCi8=,iv:98MhoST6Wzvz//tG0UbzEz6h4fMz+cXJWP2C1JZYWAo=,tag:er0vVho57bUxopa6Mf3hUg==,type:str]",
+  "use": "ENC[AES256_GCM,data:Qqr8,iv:0NzkdClIluxFw1Zemj1nDf2V6j99u0sVsL9T9SvXK9I=,tag:8ibK6OCKnWaTMZWUc4pXSg==,type:str]",
+  "kid": "ENC[AES256_GCM,data:8ItZ1IQb4FE2CB4f7SDxGdx0LLCLgzxMuUgO5HhpIsKBEOBz35OgHmjzwQ==,iv:DssrSLH6HiPuQeFRUcVJzzq7Xpvcy3Jq7VBBQK9BQYM=,tag:UxOf3Gpb/Bz+1AjZSE0waQ==,type:str]",
+  "crv": "ENC[AES256_GCM,data:eEtqpPo=,iv:f5u3WEs3OmwkAzmOWAfRUKr3BCqEBSxd0stXuHDy1Z0=,tag:QiKu9JHsEtcNcUbtB77pPw==,type:str]",
+  "d": "ENC[AES256_GCM,data:t/4ZnAEBCeoSSByP364XFRQ46x6C/xdkIlQ+mM2S7izZnHCQY+zoLv6OmA==,iv:kYFVBWGsZUFPzM6Wu1ONN41CXKQ7xjDEw/TkU5hqPQI=,tag:2SfvgO5eSiw0+34hRz1aqA==,type:str]",
+  "kty": "ENC[AES256_GCM,data:wkY=,iv:iQSSa8gy5pcXZUm8ro+gSfvDfA3vBni7lPK0GQ84GOw=,tag:tJYplnJbj+7UkciGMq2l2g==,type:str]",
+  "x": "ENC[AES256_GCM,data:uMMaf8DmEXu/p7tx/vU04VtsFSmjM9YoEb4v/HcddnjZXFx+ly0ynqWUEw==,iv:W7hLVjhQN8GEea0fLz61vyYu1544G1MSmSfC4duGwz4=,tag:fEBgfu2vnCLsI127FSxwYA==,type:str]",
+  "y": "ENC[AES256_GCM,data:eR+70P0nc1/iVuWqDdMDw5sopAj6D1sj7915AKYmBSFYEtldCOJeVP8hyg==,iv:j70Pc7GRTJco0dHYYTVZbTcJpalhbjJig1NCv9QtLfs=,tag:Mfs0c+JQtwUvx6Tzy4qpIw==,type:str]",
+  "sops": {
+    "kms": null,
+    "gcp_kms": null,
+    "azure_kv": null,
+    "hc_vault": null,
+    "age": [
+      {
+        "recipient": "age120pknt3u4y9n2dqevnd57ns4eudv6kuajkjzr05zlu6wqtz59dyq7vv7wz",
+        "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGU1plakFXTGp5QWxtKy8w\nYWRZRFdhUEpDVzFzWktMd0hiSjkvSU1WWUJNClU0ekdPQzJoaklTdnk0cFdTaVRO\nRG9MODhaZnhETHBGSkVTV0UyeGVKaDQKLS0tIFlzc1hEeWp4RXNVUDF0NzdsUXMr\nMXc2ZjJtUFJnVWJVaXRWT0lHb1gwbFkKyh5P0vZg/fo9yRrOiOEKJTtpFBEo6BzV\nd10HQkGYHiZqHREpR0eNyEZ18XxXII9Ifnppn3Pf/WlWm6WQ5oMnBw==\n-----END AGE ENCRYPTED FILE-----\n"
+      }
+    ],
+    "lastmodified": "2023-12-29T15:03:15Z",
+    "mac": "ENC[AES256_GCM,data:yqgkcbHC6JGhhz+svBYozMVkE0XWIetxVogD3G7wTsFJS+zrLlgYeXrStYivqzCUqZznAMvSgbXT0gkMh2AfQ5+0dWQTw3rU8qvHOOM9ucq+wNUo/xfsyrieGayDQulDeEPZcj9VBvGYty2e+ydztL16e/gWrUDW101qu0wHibQ=,iv:OLhUvWnTacYaiW9RdtyR15W4ssy4AOSLGGS/dFXAwek=,tag:1sALYQBQkdTRJlkZWbLQnQ==,type:str]",
+    "pgp": [
+      {
+        "created_at": "2023-12-29T15:03:15Z",
+        "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DYq721CgpBoASAQdAS9FmVJ9Uyix4QwEmpCuRyX1splrliNYLZqf3teo24GEw\n00Ofn8Vrq4rMojOeaenRwdxYUXwA5KuSXfE2QHWQZ/qZRNFqXCtlKdRybLfACTbn\n0l4BM0V6NGlOuVNQHNZZHYau0v3HcXJMKoCva/3d0mq1oH2ddntQ2te0xNiiksnN\nlJlwbkCfz1o506TFRHd9mooaymYCsCTZjyx9cHF3HYwOCJRqPhadN9FXtMQb/bYo\n=TFgx\n-----END PGP MESSAGE-----",
+        "fp": "4818145E783E2A4A04E816A479807D08C6EF6460"
+      }
+    ],
+    "unencrypted_suffix": "_unencrypted",
+    "version": "3.8.1"
+  }
+}
--- a/vad/yarn.lock
+++ b/vad/yarn.lock
@ -1474,10 +1474,15 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==

-bn.js@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
-  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
+bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==

 brace-expansion@^1.1.7:
  version "1.1.11"
@ -1510,7 +1515,7 @@ braces@~3.0.2:
  dependencies:
    fill-range "^7.0.1"

-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@ -1546,7 +1551,7 @@ browserify-des@^1.0.0:
    inherits "^2.0.1"
    safe-buffer "^5.1.2"

-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
@ -1554,20 +1559,28 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
    bn.js "^4.1.0"
    randombytes "^2.0.1"

-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+browserify-rsa@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e"
+  integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==
+  dependencies:
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
    create-hash "^1.2.0"
    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    parse-asn1 "^5.1.6"
+    readable-stream "^3.6.2"
+    safe-buffer "^5.2.1"

 browserify-zlib@^0.2.0:
  version "0.2.0"
@ -2214,6 +2227,19 @@ elliptic@^6.5.3:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.0"

+elliptic@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
 emojis-list@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@ -2640,7 +2666,7 @@ he@1.1.1:
  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=

-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.0, hmac-drbg@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@ -3541,7 +3567,7 @@ parallel-transform@^1.1.0:
    inherits "^2.0.3"
    readable-stream "^2.1.5"

-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0, parse-asn1@^5.1.6:
  version "5.1.6"
  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
@ -3895,6 +3921,15 @@ readable-stream@^3.5.0, readable-stream@^3.6.0:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

+readable-stream@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@ -4060,7 +4095,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
  dependencies:
    aproba "^1.1.1"

-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==