diff --git a/.github/auto-label.yml b/.github/auto-label.yml index 99d9a2367f..e8b2ca3855 100644 --- a/.github/auto-label.yml +++ b/.github/auto-label.yml @@ -25,6 +25,7 @@ vendor/aws-iam-authenticator: vendor/aws-iam-authenticator/** vendor/aws-okta: vendor/aws-okta/** vendor/aws-vault: vendor/aws-vault/** vendor/cfssl: vendor/cfssl/** +vendor/cfssljson: vendor/cfssljson/** vendor/chamber: vendor/chamber/** vendor/cli53: vendor/cli53/** vendor/cloudflared: vendor/cloudflared/** diff --git a/README.md b/README.md index 4e081de056..87726d30fd 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ aws-iam-authenticator 0.5.0 A tool to use AWS IAM credentials to authen aws-okta 0.19.4 aws-okta allows users to authenticate with AWS using Okta credentials aws-vault 5.3.2 A vault for securely storing and accessing AWS credentials in development environments cfssl 1.4.1 Cloudflare's PKI and TLS toolkit -chamber 2.8.1 CLI for managing secrets +cfssljson 1.4.1 Cloudflare's PKI and TLS toolkit json parser cli53 0.8.17 Command line tool for Amazon Route 53 cloudflared 2020.3.2 Argo Tunnel client cloudposse-atlantis 0.9.0.3 Terraform For Teams, enhanced by Cloud Posse diff --git a/docs/targets.md b/docs/targets.md index b76ac1c28c..d9c87bc2b1 100644 --- a/docs/targets.md +++ b/docs/targets.md @@ -9,6 +9,7 @@ aws-iam-authenticator 0.5.0 A tool to use AWS IAM credentials to authen aws-okta 0.19.4 aws-okta allows users to authenticate with AWS using Okta credentials aws-vault 5.3.2 A vault for securely storing and accessing AWS credentials in development environments cfssl 1.4.1 Cloudflare's PKI and TLS toolkit +cfssljson 1.4.1 Cloudflare's PKI and TLS toolkit json parser chamber 2.8.1 CLI for managing secrets cli53 0.8.17 Command line tool for Amazon Route 53 cloudflared 2020.3.2 Argo Tunnel client diff --git a/vendor/cfssl/Makefile b/vendor/cfssl/Makefile index 82858909f3..8af468bc2f 100644 --- a/vendor/cfssl/Makefile +++ b/vendor/cfssl/Makefile @@ -4,7 +4,7 @@ include ../../tasks/Makefile.apk export VENDOR = cloudflare export PACKAGE_NAME = cfssl export PACKAGE_REPO_NAME = cfssl -export DOWNLOAD_URL = $(PACKAGE_REPO_URL)/releases/download/v$(PACKAGE_VERSION)/cfssl_$(PACKAGE_VERSION)_$(OS)_$(ARCH) +export DOWNLOAD_URL = $(PACKAGE_REPO_URL)/releases/download/v$(PACKAGE_VERSION)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(OS)_$(ARCH) export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary install: diff --git a/vendor/cfssljson/DESCRIPTION b/vendor/cfssljson/DESCRIPTION new file mode 100644 index 0000000000..ea857c417d --- /dev/null +++ b/vendor/cfssljson/DESCRIPTION @@ -0,0 +1 @@ +Cloudflare's PKI and TLS toolkit json parser diff --git a/vendor/cfssljson/LICENSE b/vendor/cfssljson/LICENSE new file mode 100644 index 0000000000..5bcf0284a0 --- /dev/null +++ b/vendor/cfssljson/LICENSE @@ -0,0 +1 @@ +BSD2 diff --git a/vendor/cfssljson/Makefile b/vendor/cfssljson/Makefile new file mode 100644 index 0000000000..749d78b761 --- /dev/null +++ b/vendor/cfssljson/Makefile @@ -0,0 +1,15 @@ + +include ../../tasks/Makefile.package +include ../../tasks/Makefile.apk + +export VENDOR = cloudflare +export PACKAGE_NAME = cfssljson +export PACKAGE_REPO_NAME = cfssl +export DOWNLOAD_URL = $(PACKAGE_REPO_URL)/releases/download/v$(PACKAGE_VERSION)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(OS)_$(ARCH) +export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary + +install: + $(call download_binary) + +test: + $(PACKAGE_EXE) -f ./cfssljson-test.json -bare -stdout >/dev/null diff --git a/vendor/cfssljson/RELEASE b/vendor/cfssljson/RELEASE new file mode 100644 index 0000000000..c227083464 --- /dev/null +++ b/vendor/cfssljson/RELEASE @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/vendor/cfssljson/VERSION b/vendor/cfssljson/VERSION new file mode 100644 index 0000000000..347f5833ee --- /dev/null +++ b/vendor/cfssljson/VERSION @@ -0,0 +1 @@ +1.4.1 diff --git a/vendor/cfssljson/cfssljson-test.json b/vendor/cfssljson/cfssljson-test.json new file mode 100644 index 0000000000..1743eb8a11 --- /dev/null +++ b/vendor/cfssljson/cfssljson-test.json @@ -0,0 +1 @@ +{"cert":"-----BEGIN CERTIFICATE-----\nMIIDszCCApugAwIBAgIUSqaQeM8cK9G5jQe78tlyhwP++CIwDQYJKoZIhvcNAQEL\nBQAwaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT\nDVNhbiBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4x\nDDAKBgNVBAsTA1dXVzAeFw0yMDA0MTcyMzIwMDBaFw0yNTA0MTYyMzIwMDBaMGkx\nCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g\nRnJhbmNpc2NvMR8wHQYDVQQKExZJbnRlcm5ldCBXaWRnZXRzLCBJbmMuMQwwCgYD\nVQQLEwNXV1cwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL8iIcysXG\na+sVTgeUv/8avoaip5VWetJNEXve6fpsB83+Nh/0fkq91bw3C83Qgu0BEJ7JJW0z\n9nA7ptVVZP9VtK1c/LKbULA+jU9IabUAfvavt8yjzCAFYeppE+KNq2rg9gu2lyWP\nF1OKYd9BJtdqSJ6MKZvS563PwazsfZqNp7f3tiefvMfFC/cxityFSPtiWOsdEYZO\nhhHdf1ieecxLiNansK3Vlzx9FW76TXLcczw9jFGqZF2DGaFYRVEh0MP0C856IBBf\n7L5xlxDXhg58a117zZZi7WALr71zzW+QWmCNboEqwo0OdMvnb8581h300iiukCja\nutchAV8gSsS7AgMBAAGjUzBRMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD\nAQH/MB0GA1UdDgQWBBSIHcupXfzG/z8DJgXiXytXGpgDLTAPBgNVHREECDAGhwR/\nAAABMA0GCSqGSIb3DQEBCwUAA4IBAQAQO3wHoTFPo5nUAxbqaR48FDfUBXIEi6Xi\n1PyGaf2groOhJhsLje2Y8vBi4I9kH1n6PQ7zgT8/qajJaj6hYvRuqSuicxYqQHPa\ny7WLXjJUtbPxikp8+O0dP0xz8NimaiPAFB6MEPglqjJ4YhWRllRHn1XLVBgJkYbP\nz0G/aXGr89HkP5/ENAKRgsfe13p8ECPHmpAtNeGAZHB4QDHMvN/HcI6eugO2h6ii\nv0l4M1NjuM6y310A4rJujfT7pEKDB8jDxvX8/R7w8O1Yo8QJ9LS+MXgeoAu4S6az\n9lSVpdcPy156KPh7oeEfeqM+G8RkipszNLnMRkiounEy1S+84wqn\n-----END CERTIFICATE-----\n","csr":"-----BEGIN CERTIFICATE REQUEST-----\nMIIDGTCCAgECAQAwaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx\nFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdl\ndHMsIEluYy4xDDAKBgNVBAsTA1dXVzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\nAQoCggEBAMvyIhzKxcZr6xVOB5S//xq+hqKnlVZ60k0Re97p+mwHzf42H/R+Sr3V\nvDcLzdCC7QEQnsklbTP2cDum1VVk/1W0rVz8sptQsD6NT0hptQB+9q+3zKPMIAVh\n6mkT4o2rauD2C7aXJY8XU4ph30Em12pInowpm9Lnrc/BrOx9mo2nt/e2J5+8x8UL\n9zGK3IVI+2JY6x0Rhk6GEd1/WJ55zEuI1qewrdWXPH0VbvpNctxzPD2MUapkXYMZ\noVhFUSHQw/QLznogEF/svnGXENeGDnxrXXvNlmLtYAuvvXPNb5BaYI1ugSrCjQ50\ny+dvznzWHfTSKK6QKNq61yEBXyBKxLsCAwEAAaBrMGkGCSqGSIb3DQEJDjFcMFow\nWAYDVR0RBFEwT4ILZXhhbXBsZS5jb22CD3d3dy5leGFtcGxlLmNvbYEQamRvZUBl\neGFtcGxlLmNvbYcEfwAAAYYXaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20wDQYJKoZI\nhvcNAQELBQADggEBAK/gH0qmilps+jmtxwtfukUYmL0EVuZntvHMjz4f2AOm4/7a\ned19crMPnvzASBZXNE4iysHneD34sH1fHZrZGzf8cR1qjcGK60YGMM3GJZQ6p4MZ\nGTvIos7MUoP8h5MAB6UrX5ivRArP797ek81ffwvFj9x0ELrpAz8gA6EtJuYuuKkq\noiDtO5NrEw+OqZXsXORT7qJjV+3lZ9ad/O3ZUIHm72CrXYLrp1ZmWO5+YEZjbeu9\nbyJH0MBrtWBac0x9r2/lci1UVrvt0SoRZsl+DDs8FaW5eYTiyKymyIf1c0VlbRqZ\nBv6I0BHgZ8qlYl1WCGTvwxex//fMOiY/bQBvEM0=\n-----END CERTIFICATE REQUEST-----\n","key":"-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEAy/IiHMrFxmvrFU4HlL//Gr6GoqeVVnrSTRF73un6bAfN/jYf\n9H5KvdW8NwvN0ILtARCeySVtM/ZwO6bVVWT/VbStXPyym1CwPo1PSGm1AH72r7fM\no8wgBWHqaRPijatq4PYLtpcljxdTimHfQSbXakiejCmb0uetz8Gs7H2ajae397Yn\nn7zHxQv3MYrchUj7YljrHRGGToYR3X9YnnnMS4jWp7Ct1Zc8fRVu+k1y3HM8PYxR\nqmRdgxmhWEVRIdDD9AvOeiAQX+y+cZcQ14YOfGtde82WYu1gC6+9c81vkFpgjW6B\nKsKNDnTL52/OfNYd9NIorpAo2rrXIQFfIErEuwIDAQABAoIBAQCD27T6cI+WTkfb\nqmt0XP4OyIg7uaXwF9DISzmPUi+6kQE6DrxyUwT336yk2ljjKwMY4SoIWs5T/k1q\nA9+CKp57RymfKTJBANYyWyKbaty/yVatHWSNsngxgrEP5u9fMSkU8X95Ohfqf+Zf\nXg/+C6LS8MixTmWU4n2aCVpIPJ0kX9glgzWFSB4tOkzmf1i09VljbFI9ffYpWBbz\n/R3nc7qUdD4C3AtU7sMBuCOJSX6OBPTmIZSWrr5mVZjdZmCd7hSybqyzb3I9//Mw\n+pdNSPY7kjZPxBaTe4tmWto/3dZ+4yuc3v5oSt3Xb9whkKSHpiEyPBp9jEluptPd\nGlP2EDUBAoGBAN+x3GFeK25fXTtUv3PPCGZyC2GyviD8uBtrVCYqHm+OTQzzZ1pG\n+ZZ5bY6tKiflMnVmMPhF0AKSckDjAhhJHPbPtlEyt8/0/8Fnqx7Pz1kVd7ZYMz4K\n+/pGFR8xdIdDTzrTeTs4guRLIiCOZuxkVIAJchhse9KuduI43BvmsNZbAoGBAOlm\nJD0OwlCLQltJZi2+KqXykHHj1fKOHI05CaqJUuptu0cQOqTTEWiH4MgaBMVfxyCH\ntj+nTvD8X/G7OvgNnI+iUd6cR888PwciiXau2bSHZ71DldwtM/vu/P99iBEjfZYy\n6/9b7D8RM9vwVsjdHLcG0izcnCkoCOCnxp5bJNkhAoGAUcx7VwuVfCXZNOH3pISX\ngMbBTLeM+QkQ1c34loAeYxK5MDwtlgCQMiszGdJOsQoJ2o5E5/S3bMlaiEm6sWDC\n+6nW9HhEaQIhJ/sdwwWgv+WuwfocutpPbCSGgsKV5wSBC3TbRwGSM6MZ1qfcESNb\nFvrdQvsgiFkN1gmOy5EfJzMCgYEAzQ+8zxhkiTeROXsnlxD5j4uqdSXkF5Pcagev\nAnJcszNt02Xi4GXBacHYMHcLsg4QefhCm3J33SsfcNc7XC05XMkUfS15ug4IolAp\nzmiZRg+hiZwT0rq0bajwB9lW7xfrg0eCKX2t90s58QcceKYsUHJhvqClY1OVWSyP\nSRpzKYECgYEAzdIhErZEMPnB8Cymszx+IbKsDaKJm1j6np1rLtxrCUTW5ordoF9t\njZBcmyXZSQ3VaF93D+U78+/7UNktEbIYcT9orgusxA+6NBH5L2IVNTZ1CHtA/Pw0\nngY1sI1mAcTo0x5fpULS9SN0utEtcFlXCI6W+MIkG8qgU4RfZ4FPqb0=\n-----END RSA PRIVATE KEY-----\n"}