diff --git a/tizen-cli/Dockerfile b/tizen-cli/Dockerfile index eccbb59..e733ebf 100644 --- a/tizen-cli/Dockerfile +++ b/tizen-cli/Dockerfile @@ -32,4 +32,7 @@ RUN INSTALLER=/tmp/$(basename "$TIZEN_CLI_INSTALLER_URL") \ $TIZEN_USER_HOME/tizen-studio/package-manager COPY docker-entrypoint.sh /usr/local/bin/ +# Copy certificates directly to container +# COPY certificates/ /run/certificates/ + ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/tizen-cli/certificates/author.crt b/tizen-cli/certificates/author.crt new file mode 100644 index 0000000..34c1a02 --- /dev/null +++ b/tizen-cli/certificates/author.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDbjCCAlagAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBijELMAkGA1UEBhMCS1Ix +FDASBgNVBAgTC1NvdXRoIEtvcmVhMQ4wDAYDVQQHEwVTdXdvbjEmMCQGA1UEChMd +U2Ftc3VuZyBFbGVjdHJvbmljcyBDby4sIEx0ZC4xCzAJBgNVBAsTAlZEMSAwHgYD +VQQDExdTYW1zdW5nIEF1dGhvciBDQSBDbGFzczAeFw0xOTA3MjkxNDIwNDlaFw0y +MDA3MjgxNDIwNDlaME4xCTAHBgNVBAYTADEJMAcGA1UECBMAMQkwBwYDVQQHEwAx +CTAHBgNVBAoTADEJMAcGA1UECxMAMRUwEwYDVQQDEwxpZmxpeERldmljZXMwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPfPe3exMXhDBIxXtm3aDoFP4p +Y4YwZK8u8tIvNWfTaGwYJa/PMNNztMSjVIidgknXbBuaC0zTXXktHh4oFZbjh8tn +SO49ckm02+rnaxUWMITT3K9cxBqYmKMTbmyiaB7cPTjdI38alS0b0flOMEc/RSK4 +njjyYwavPckLFz/xCOk9MRHvC+RP4TXT+U3SARLeyBTeILU2DQU5cEqRHanCCcdG +F+xfBHw7cxy7g+B6JuQZw6tE+/twWYcnZj0hqEq9aMCR4QTguoZm1MmLW6xisOUh +jriMR2CsYI8GOYhaCXb5MnzrUwJdrzlxf8icYnJ5Ix5uLv4yE9y9l8oD8Ju7AgMB +AAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0GCSqGSIb3DQEBCwUAA4IB +AQBn/E7tWoOfe56KsrueYRcLW5a7Bpg995r4IjjiGPs3Ifbpy5z6+rapWoPRef1a +56ODcNJCkeP9SHaer5rpfVEzGUp+a4A27KBEhPOPobCCHwXvPpP9NGO1+V3yatCU +cCD2V/7KOjZUvqXf7wrApPJJsC7DlGoUQ4FrYIft23ruByvKmAPv/u0E1ok+o14u +ml37JP3ULLyXYMpUVwrFTY0rP3frOIMxQfdOxbdmE7D6WswRwIaFaGXp3Bh2E2CG +Y3WqGQIGKk00rG8QDh8RBaRusG6dnssiqilDr7d6sDkrtPP1C/wInr7VJ6qqWVVm +QBiCLcgP4vPZYie03/lov8ON +-----END CERTIFICATE----- diff --git a/tizen-cli/certificates/author.csr b/tizen-cli/certificates/author.csr new file mode 100644 index 0000000..54e493c --- /dev/null +++ b/tizen-cli/certificates/author.csr @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICkzCCAXsCAQAwTjEJMAcGA1UEBhMAMQkwBwYDVQQIEwAxCTAHBgNVBAcTADEJ +MAcGA1UEChMAMQkwBwYDVQQLEwAxFTATBgNVBAMTDGlmbGl4RGV2aWNlczCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9897d7ExeEMEjFe2bdoOgU/ilj +hjBkry7y0i81Z9NobBglr88w03O0xKNUiJ2CSddsG5oLTNNdeS0eHigVluOHy2dI +7j1ySbTb6udrFRYwhNPcr1zEGpiYoxNubKJoHtw9ON0jfxqVLRvR+U4wRz9FIrie +OPJjBq89yQsXP/EI6T0xEe8L5E/hNdP5TdIBEt7IFN4gtTYNBTlwSpEdqcIJx0YX +7F8EfDtzHLuD4Hom5BnDq0T7+3BZhydmPSGoSr1owJHhBOC6hmbUyYtbrGKw5SGO +uIxHYKxgjwY5iFoJdvkyfOtTAl2vOXF/yJxicnkjHm4u/jIT3L2XygPwm7sCAwEA +AaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBk3JDslC2140Q9qgxZxEe8wjd78emyRydR +7qEHoURmzWL/BFxosl16ITiNP0FbBgyetAua3SLABs/BLvvJpD+qR87d8EIOp0hM +COuiFsVq9hLoggwr13iGBe2L4MC03gI3lAiTBHKipT+ba2HuTquO2hb5k/CRw9rp +pBU4eCZZqrF9XgTDB7WWUB+zt4AhadSHyvqh+6LEI9gYi8Ygg5apE2xQLUNBH5zr +6OWwSca4qjAUm1IITfj/6k4P/YFm61DQIjA45oqCrs7VlEpMR3W0azI8l/G5Z0Zi +3XfwhaOAwqL30Rjyk8Cw38ey7P7yrTTYZY9RfCwwuleMxXvC3hdP +-----END CERTIFICATE REQUEST----- + diff --git a/tizen-cli/certificates/author.p12_bak_20190729042049 b/tizen-cli/certificates/author.p12_bak_20190729042049 new file mode 100644 index 0000000..0750fda Binary files /dev/null and b/tizen-cli/certificates/author.p12_bak_20190729042049 differ diff --git a/tizen-cli/certificates/author.pri b/tizen-cli/certificates/author.pri new file mode 100644 index 0000000..fba1e23 Binary files /dev/null and b/tizen-cli/certificates/author.pri differ diff --git a/tizen-cli/certificates/author.pub b/tizen-cli/certificates/author.pub new file mode 100644 index 0000000..4063372 Binary files /dev/null and b/tizen-cli/certificates/author.pub differ diff --git a/tizen-cli/certificates/author_cert_password b/tizen-cli/certificates/author_cert_password new file mode 100644 index 0000000..ef07241 --- /dev/null +++ b/tizen-cli/certificates/author_cert_password @@ -0,0 +1 @@ +nHujtd$ew156 \ No newline at end of file diff --git a/tizen-cli/certificates/author_cert_pkcs12 b/tizen-cli/certificates/author_cert_pkcs12 new file mode 100644 index 0000000..c6db08d Binary files /dev/null and b/tizen-cli/certificates/author_cert_pkcs12 differ diff --git a/tizen-cli/certificates/device-profile.xml b/tizen-cli/certificates/device-profile.xml new file mode 100644 index 0000000..08451b5 --- /dev/null +++ b/tizen-cli/certificates/device-profile.xml @@ -0,0 +1 @@ +devices@iflix.comPublicIndividualBDCGDNNVALZDSMIIEtjCCA56gAwIBAgIBZDANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCS1IxFDASBgNVBAgMC1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmljcyBDby4sIEx0ZC4xCzAJBgNVBAsMAlZEMSUwIwYDVQQDDBxWRCBERVZFTE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE5MDcyOTEyMzIyOFoXDTIwMDcyODEyMzIyOFowggGPMREwDwYDVQQDDAhUaXplblNESzEJMAcGA1UECwwAMQkwBwYDVQQKDAAxCTAHBgNVBAcMADEJMAcGA1UECAwAMQkwBwYDVQQGEwAxggFBMIIBPQYJKoZIhvcNAQkBFoIBLmRldmljZXNAaWZsaXguY29tJnRva2VuX3R5cGU9YmVhcmVyJnVzZXJJZD1lb3c0ejdiYjNjJmFjY2Vzc190b2tlbl9leHBpcmVzX2luPTg2Mzk5NSZjbGllbnRfaWQ9NGZiN2ZuZjNucCZhY2Nlc3NfdG9rZW49Q3d3ZXM4RVVYYSZyZWZyZXNoX3Rva2VuPS0xJmF1dGhfc2VydmVyX3VybD11cy1hdXRoMi5zYW1zdW5nb3NwLmNvbSZzdGF0ZT1hY2NvdW50Y2hlY2tkb2dlbmVyYXRlZHN0YXRldGV4dCZjbG9zZWRBY3Rpb249c2lnbkluU3VjY2VzcyZjbG9zZT10cnVlJmFwaV9zZXJ2ZXJfdXJsPXVzLWF1dGgyLnNhbXN1bmdvc3AuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhGcLaFhLucuFha07JxtmwIgpgXEwowCyvCfmNpOS8qBuaUjKaK5MjkxK0pO3wJ4eLG2yYcz9Jg8HYFZrdrW8BVdNeyq7WdnrcA+8Srq9bw0ENd3on9Cld5OjhGmj0ST1ODzomTAceA1026o+xLL9SoTkSmAByKN/PDGc0/X7wqh5GAFi4spNmPsVEHDt+Lk50yxg3+IbHuHygso7b3/KHNk0NL25c81ebcEb3K6/PgLWf9h4ZmDY5UtntYtsIR9613m3TOBK6XLV6pSEMh8MqbKXPwNBGt2dJ7j9VLQM8YqBz7W5HUYRXYZ+GGOeHl7kBNR+h8aiVtGNqS8sIPVkXwIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAQEAacyaNHqXbdFvDjHvh/p9WFXFoU9Fc0nAumNia5neyIH++4unQpICI9JpFlhP+zWKRfoIS+tN3/FkoVIT+3CfPMNrXojoMnhriD4k3t4pUgGIiU/VznEjJx7vGit/UgdFEGA4MoKo1qLnPnOx70ow6O9tn+8aOP13hKy0sLPFnuU7gFFIuBG/r+pn1b5HgvGDkYI9fSCN2Q+5KSbvDtmSDw/JFjDUyx69uKGKCDhGKIIdjnYISStO5sS05KxKXSmfRree/abIH4MY7bAMWdsH0dCyj5XqCKZWV58o0dU6C5hYPFQ+kfKptiJDMWUlyeojH9nBDL3j0O01vhckzXfRIQ==K0roTZq0DXsQ8Np27rbv1WlS+W6tzoL5Z9IpCeYA85x8g4TJrkgQzD8cHor5lhODpNDRVp+fQCbQkTFk5LB1SvQvFJtsFDkkhxGGFE2xFFuViHgWyhqwH9uKOm9Dl5ZTfQ3+NHTmMOwMbSKsUM3zv9SptowZgy4CjMy3hGNKR/zr2kQTraKHsE3BHy5nRlXuIBvLZNp2uIVdgo4nV8XlvK0mClmQrLG78FbuMNfZ2f2V3H0K+9eXcrcjLJyGYi4VpxWs1lHYrhk5p3ChOzogL2CML3Rx3GZjYlxiF0Zj0zypxmXgl/pDIwijh2JzhMKDZSWiwGKqcFkFS+4CD4tWLQ== \ No newline at end of file diff --git a/tizen-cli/certificates/distributor.crt b/tizen-cli/certificates/distributor.crt new file mode 100644 index 0000000..dd02951 --- /dev/null +++ b/tizen-cli/certificates/distributor.crt @@ -0,0 +1 @@ +MIIEtjCCA56gAwIBAgIBZDANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCS1IxFDASBgNVBAgMC1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmljcyBDby4sIEx0ZC4xCzAJBgNVBAsMAlZEMSUwIwYDVQQDDBxWRCBERVZFTE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE5MDcyOTEyMzIyOFoXDTIwMDcyODEyMzIyOFowggGPMREwDwYDVQQDDAhUaXplblNESzEJMAcGA1UECwwAMQkwBwYDVQQKDAAxCTAHBgNVBAcMADEJMAcGA1UECAwAMQkwBwYDVQQGEwAxggFBMIIBPQYJKoZIhvcNAQkBFoIBLmRldmljZXNAaWZsaXguY29tJnRva2VuX3R5cGU9YmVhcmVyJnVzZXJJZD1lb3c0ejdiYjNjJmFjY2Vzc190b2tlbl9leHBpcmVzX2luPTg2Mzk5NSZjbGllbnRfaWQ9NGZiN2ZuZjNucCZhY2Nlc3NfdG9rZW49Q3d3ZXM4RVVYYSZyZWZyZXNoX3Rva2VuPS0xJmF1dGhfc2VydmVyX3VybD11cy1hdXRoMi5zYW1zdW5nb3NwLmNvbSZzdGF0ZT1hY2NvdW50Y2hlY2tkb2dlbmVyYXRlZHN0YXRldGV4dCZjbG9zZWRBY3Rpb249c2lnbkluU3VjY2VzcyZjbG9zZT10cnVlJmFwaV9zZXJ2ZXJfdXJsPXVzLWF1dGgyLnNhbXN1bmdvc3AuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhGcLaFhLucuFha07JxtmwIgpgXEwowCyvCfmNpOS8qBuaUjKaK5MjkxK0pO3wJ4eLG2yYcz9Jg8HYFZrdrW8BVdNeyq7WdnrcA+8Srq9bw0ENd3on9Cld5OjhGmj0ST1ODzomTAceA1026o+xLL9SoTkSmAByKN/PDGc0/X7wqh5GAFi4spNmPsVEHDt+Lk50yxg3+IbHuHygso7b3/KHNk0NL25c81ebcEb3K6/PgLWf9h4ZmDY5UtntYtsIR9613m3TOBK6XLV6pSEMh8MqbKXPwNBGt2dJ7j9VLQM8YqBz7W5HUYRXYZ+GGOeHl7kBNR+h8aiVtGNqS8sIPVkXwIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAQEAacyaNHqXbdFvDjHvh/p9WFXFoU9Fc0nAumNia5neyIH++4unQpICI9JpFlhP+zWKRfoIS+tN3/FkoVIT+3CfPMNrXojoMnhriD4k3t4pUgGIiU/VznEjJx7vGit/UgdFEGA4MoKo1qLnPnOx70ow6O9tn+8aOP13hKy0sLPFnuU7gFFIuBG/r+pn1b5HgvGDkYI9fSCN2Q+5KSbvDtmSDw/JFjDUyx69uKGKCDhGKIIdjnYISStO5sS05KxKXSmfRree/abIH4MY7bAMWdsH0dCyj5XqCKZWV58o0dU6C5hYPFQ+kfKptiJDMWUlyeojH9nBDL3j0O01vhckzXfRIQ== \ No newline at end of file diff --git a/tizen-cli/certificates/distributor.csr b/tizen-cli/certificates/distributor.csr new file mode 100644 index 0000000..5220c8a --- /dev/null +++ b/tizen-cli/certificates/distributor.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEKjCCAxICAQAwggGPMREwDwYDVQQDDAhUaXplblNESzEJMAcGA1UECwwAMQkw +BwYDVQQKDAAxCTAHBgNVBAcMADEJMAcGA1UECAwAMQkwBwYDVQQGEwAxggFBMIIB +PQYJKoZIhvcNAQkBFoIBLmRldmljZXNAaWZsaXguY29tJnRva2VuX3R5cGU9YmVh +cmVyJnVzZXJJZD1lb3c0ejdiYjNjJmFjY2Vzc190b2tlbl9leHBpcmVzX2luPTg2 +Mzk5NSZjbGllbnRfaWQ9NGZiN2ZuZjNucCZhY2Nlc3NfdG9rZW49Q3d3ZXM4RVVY +YSZyZWZyZXNoX3Rva2VuPS0xJmF1dGhfc2VydmVyX3VybD11cy1hdXRoMi5zYW1z +dW5nb3NwLmNvbSZzdGF0ZT1hY2NvdW50Y2hlY2tkb2dlbmVyYXRlZHN0YXRldGV4 +dCZjbG9zZWRBY3Rpb249c2lnbkluU3VjY2VzcyZjbG9zZT10cnVlJmFwaV9zZXJ2 +ZXJfdXJsPXVzLWF1dGgyLnNhbXN1bmdvc3AuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAhGcLaFhLucuFha07JxtmwIgpgXEwowCyvCfmNpOS8qBu +aUjKaK5MjkxK0pO3wJ4eLG2yYcz9Jg8HYFZrdrW8BVdNeyq7WdnrcA+8Srq9bw0E +Nd3on9Cld5OjhGmj0ST1ODzomTAceA1026o+xLL9SoTkSmAByKN/PDGc0/X7wqh5 +GAFi4spNmPsVEHDt+Lk50yxg3+IbHuHygso7b3/KHNk0NL25c81ebcEb3K6/PgLW +f9h4ZmDY5UtntYtsIR9613m3TOBK6XLV6pSEMh8MqbKXPwNBGt2dJ7j9VLQM8YqB +z7W5HUYRXYZ+GGOeHl7kBNR+h8aiVtGNqS8sIPVkXwIDAQABoFQwUgYJKoZIhvcN +AQkOMUUwQzBBBgNVHREEOjA4hhRVUk46dGl6ZW46cGFja2FnZWlkPYYgVVJOOnRp +emVuOmRldmljZWlkPUJEQ0dETk5WQUxaRFMwDQYJKoZIhvcNAQEFBQADggEBAHRQ +qwW4erejizhO/cePuNnDzHBH3i2XLDPAGPYED62bhm5pZSvX62HOwK+I0b9djFbQ +7omN2Z9YbB8QYi5QcIxLDzPsi29V6/BRdKXeWN1qf/Bttb67M7LxhAFsSilw5x7X +NJOP3FIuHBBg4S230XxE5CDe2C6la+f56I491BFkyr4ujk/jaop28L8vT83M9P6Z +FxG2Z+DgNet6WPGdB143ucFy3np3d/3Ksp+yePSvBBOXbvtfOKebSjuUGrHBbPX0 +9dTh90wgtsPP8wnkx9/NyiHSwhMdRkaaU28ppaiSaXUGw47Zmv+wLZ340BAiBvoi +wGp1L+uUAPQ1rxeuo9E= +-----END CERTIFICATE REQUEST----- + diff --git a/tizen-cli/certificates/distributor.p12 b/tizen-cli/certificates/distributor.p12 new file mode 100644 index 0000000..28f7a21 Binary files /dev/null and b/tizen-cli/certificates/distributor.p12 differ diff --git a/tizen-cli/certificates/distributor.pri b/tizen-cli/certificates/distributor.pri new file mode 100644 index 0000000..08aedc9 Binary files /dev/null and b/tizen-cli/certificates/distributor.pri differ diff --git a/tizen-cli/docker-entrypoint.sh b/tizen-cli/docker-entrypoint.sh index fc68e7f..698c96a 100755 --- a/tizen-cli/docker-entrypoint.sh +++ b/tizen-cli/docker-entrypoint.sh @@ -64,7 +64,12 @@ EOF create_security_profile() { [ -r "$AUTHOR_CERT_PKCS12_FILE" ] || print_help_exit "You must provide author certificate in PKCS12 format to build the package" [ -r "$AUTHOR_CERT_PASSWORD_FILE" ] || print_help_exit "You must provide author certificate password (even empty one)" - tizen security-profiles add -n $SECURITY_PROFILE -a $AUTHOR_CERT_PKCS12_FILE -p $(cat $AUTHOR_CERT_PASSWORD_FILE) + { # try + tizen security-profiles add -n $SECURITY_PROFILE -a $AUTHOR_CERT_PKCS12_FILE -p $(cat $AUTHOR_CERT_PASSWORD_FILE) + } || { # catch + # save log for exception + cat /home/user/tizen-studio-data/cli/logs/cli.log + } } BUILD_DIR=/tmp/build @@ -92,13 +97,13 @@ if [ "$CMD" == "package" ]; then # Next command? CMD="$1" if [ "$CMD" == "install" ]; then - # We allow to continue with install right away... - shift + # We allow to continue with install right away... + shift else - # ...otherwise send the .wgt package to STDOUT and exit - exec 1>&3 - cat "$PKG" - exit $? + # ...otherwise send the .wgt package to STDOUT and exit + exec 1>&3 + cat "$PKG" + exit $? fi fi @@ -109,15 +114,20 @@ fi if [ "$CMD" == "install" ]; then if [ -z "$PKG" ]; then - # We haven't built anything this time: Expect .wgt package on STDIN instead. - mkdir $PKG_DIR - PKG="$PKG_DIR/widget.wgt" - cat >"$PKG" + # We haven't built anything this time: Expect .wgt package on STDIN instead. + mkdir $PKG_DIR + PKG="$PKG_DIR/widget.wgt" + cat >"$PKG" fi [ -s "$PKG" ] || print_help_exit "You must provide a .wgt package on standard input or build one with the 'package' command" - # Install the package on remote Tizen device - sdb connect "$DEVICE_IP":26101 - tizen install --name $(basename $PKG) -- $PKG_DIR + { # try + # Install the package on remote Tizen device + sdb connect "$DEVICE_IP":26101 + tizen install --name $(basename $PKG) -- $PKG_DIR + } || { # catch + # save log for exception + cat /home/user/tizen-studio-data/cli/logs/cli.log + } exit $? fi