Fixes securefederatedai#834

Signed-off-by: kta-intel <[email protected]>
kta-intel · Jun 1, 2023 · 0dd55bd · 0dd55bd
1 parent 660cc02
commit 0dd55bd
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 1 deletion.
diff --git a/cert/ca/root-ca/db/root-ca.crl.srl b/cert/ca/root-ca/db/root-ca.crl.srl
@@ -0,0 +1 @@
+01
diff --git a/cert/ca/root-ca/db/root-ca.crt.srl b/cert/ca/root-ca/db/root-ca.crt.srl
@@ -0,0 +1 @@
+01
diff --git a/cert/ca/root-ca/db/root-ca.db b/cert/ca/root-ca/db/root-ca.db
diff --git a/cert/ca/root-ca/db/root-ca.db.attr b/cert/ca/root-ca/db/root-ca.db.attr
diff --git a/cert/ca/signing-ca.csr b/cert/ca/signing-ca.csr
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIID4TCCAkkCAQAwejETMBEGCgmSJomT8ixkARkWA29yZzEWMBQGCgmSJomT8ixk
+ARkWBnNpbXBsZTEaMBgGA1UEAwwRU2ltcGxlIFNpZ25pbmcgQ0ExEzARBgNVBAoM
+ClNpbXBsZSBJbmMxGjAYBgNVBAsMEVNpbXBsZSBTaWduaW5nIENBMIIBojANBgkq
+hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAi6ULFmW0sZtynDgo/LzwLD8IKprIouun
+cMKPND4aB3tL3xjmGUIYz7Rxwthh9WMruLdtSe16kaJTLw5zQXgQQ0z8wIBg0dqr
+8/91/OZhYWoK86mvVe99d30aOdR214nb3cpXlwtkdDRmUPq7q0SaBgNB9LwCDabI
++c/JeIhqujaLKHdx2ZK0m4hqHbSsDi2eJEiq8XzcXiuKuuHcBzpEtLS6viKQLCVw
+g0daXOk2tYAHzXpQzTJc7Smn+IoPUtr/AJOS3E3Ku7DspBVrR4VOixHyKKKE9sfr
+R4Zhx2M4/tRD5iFzsgowm7+vEeM3GrA/ftOvgxBeH8OeNww6PHAXQb2d02Z+SK2X
+PWNRGqpP/p8UKveWm9rRipcB3LFjyzweT3gHCKL5Il5uB27mCvazZ5D+tpKn02Re
+EL1T36KZUH7CEJaAFuTHZqXh0w0U9+yzZnkfUARcMyuMWu9m1sMjmyIP5Hxa23bA
+Qp7dv0uSBGZpKQj4cICBHMzwBDTXyylrAgMBAAGgIjAgBgkqhkiG9w0BCQ4xEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggGBAGUg2k0QuLYo/kJw
+rRLV/6fOxjey3iXxIKqPQhMpM9kz4NmviWnDAhO9whqGIo2rCWYoo2CCj+lV6HQM
+0yV7oOq/LtKFlasvUk5Fd5lVy5W32QOdmhTmM8QKljcw/T4//uNelDn0KzmuIKZe
+mZ6ENIl4/LZZple2rmwjkmIgRV2Gm1kDTAPJOZnUSK4oBWwlz+28vZbOOG03haLz
+eUynpfa2vwfk4R75VqKQRh0PmSSth01M4K8n6hcX5TqxKtS4MxlV4Kg4W91PBb6m
+6+BTZEfY84XGSc8cBIhq7DCuUr5VvZe/wBfJE/Dp0K8qc3AIRaaK7yZQPBpOlAjL
+3FtK46sCRGztZuQ7oMPQoXi0YadvTU4+XcWKHrTW8Qb44wJnBGS7pyt0IL04K+Zu
+2O+9T2SEzedpv0KpVlFJJQzFECrG2RSP2S2haEat0Y3MmgbnD39sLU1i3NCUTIzj
+lf+qKt3kI60ZHv8rn4U7PsrSNKEtILQeQVmQCgRXk0tTdKRnLA==
+-----END CERTIFICATE REQUEST-----
diff --git a/cert/ca/signing-ca/db/signing-ca.crl.srl b/cert/ca/signing-ca/db/signing-ca.crl.srl
@@ -0,0 +1 @@
+01
diff --git a/cert/ca/signing-ca/db/signing-ca.crt.srl b/cert/ca/signing-ca/db/signing-ca.crt.srl
@@ -0,0 +1 @@
+01
diff --git a/cert/ca/signing-ca/db/signing-ca.db b/cert/ca/signing-ca/db/signing-ca.db
diff --git a/cert/ca/signing-ca/db/signing-ca.db.attr b/cert/ca/signing-ca/db/signing-ca.db.attr
diff --git a/cert/col_one.csr b/cert/col_one.csr
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIDqjCCAhICAQAwDjEMMAoGA1UEAwwDb25lMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEAzHaewYPVuNKebYDJnlXYE0RSvLUSwPmOmQBxGAZbIob2L3VM
+E9sYuqe4NUMi+pk9kh0vjGih0yuikhS9yF5ZTVf9Q7Z51L+6eZ8rZ1Qd4qU+ANBa
+ev6iIn3K01MSFmmF8Y72Q834C/CCk5C90Qc6/LYrbtZeqzzrjZKRsRrgNpgEZiZV
+c4RKsFbFjOiLeC0Ixn1UcCL7dQ4IOebApP//K9B/uHs199LscyIz/HS5K2TWi7dX
+Vutbh1mBgmh2z7Qezfy+AZLo/07ZBwPvAmP5cZGkHrohcXHhXzOwCDuTMeJsbDWp
+H1lsWM48pTw8avmjiOs6bLgo9cDPmvqZ+Jt7EdAtpHZMyasu8h9MqR1yKHs0dzZa
+njlTrZ+HNTPpUEGPVR5k76ApRolAIuSS0VXnk9m6yGleiTBg+gIdOLm/ak3WwnZ8
+Jb9OyEiTmFcU6fQkAnQ8uo7jXyDdKXhxlE+lTSeATJhNk7I3Ps0ZywEOnBVZz7cP
+hlow492f9Mqf4BBRAgMBAAGgVzBVBgkqhkiG9w0BCQ4xSDBGMAwGA1UdEwEB/wQC
+MAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMA4GA1Ud
+EQQHMAWCA29uZTANBgkqhkiG9w0BAQwFAAOCAYEANiugxLkcZBCM5BdDEBA3kn3F
+Gvb3PF2FWjz470Ush7adGXhdLQE096W4ZOO51m4Itxfepe9ydqa5gKmNuONgTdH3
+whJ0l9V0hc/0OIZrTPrf2SzEBV8AkPpd/wjlxCKgkXAcJ/thOTEwAdBSdhcYioRN
+4yI9QTFtReHyaqYqiW2wCYfQnEEFWh/Ca1DG/5YUDCXRnpbYccxbseoOU1kzNMRH
+UNIz0UFvWhMUHkMVEk1GRe+xU7pKw8HJKs4PamVFjlCGsNt3GjfYkOyxSzL1/gQM
+XihaznCwe2Q68t8lNZaVMfUe4jO3AzlkLelUKf4+nyua4j1RymtuqZgnkYvVJJFL
+i+/MJC+Umy9lo7ou59UvDg/gJcRZhsdMHIiSB8wm4IXqNNAP+out/HMK5IXkXX4R
+p2m22fRq/gnDem1BoU9cqu6noQTwPlyii9/8TkO59utIsBI3LzAHLah/AlEJ/k2s
+sPmOV91w/iNEQxhwarFAhO8hlgAux12k+uL7WaMs
+-----END CERTIFICATE REQUEST-----
diff --git a/cert/col_two.csr b/cert/col_two.csr
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIDqjCCAhICAQAwDjEMMAoGA1UEAwwDdHdvMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEA1mjOJlzfHcF9vEqo4j5JVsOnYnakfn/AS+itiUhIhG/FAZGL
+GRf+cV5358jyWGAPAkGAhfRmkmiRGDNNuDaNqATYkmMnDf7OQeq5m0qPvhm6sy2m
+PASDT8i/8Xlzguh40uIJxS95dVHDaEZ5OXQVV1eDHSKA7dTryk5nuQ3Ph4vyMk4X
+VsMUn0j3iBbM5kbGu4wtR8GNY/5R3Odu+rmWdIEaMcwQcIrVDJyd2kmiXx7w6QEg
+EZgspsC2cM8/YOP+mIIKIOYyZCIbdQ1ph8tVlThjTYCrCjxVED0geAhzbReHodOV
+wO4DCe1hAH1GYrHZcYih8zlRHq4uu1GyLOw2H//4tz7s+ZmPB1r4rPszK+dzeyx/
+bw0es+symg4pCOlcoOVpHbWllwADhw3uNP2XgZnkT7PPhmy248oJcMYYjR4G9NxE
+fSVBQNewRLtMa+w7p0tPzlaoP4tXSCKp3XWhJWVhg03u381XSQpNjqRJUD+F0HPv
+hajsyd8iEXPKI+hfAgMBAAGgVzBVBgkqhkiG9w0BCQ4xSDBGMAwGA1UdEwEB/wQC
+MAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMA4GA1Ud
+EQQHMAWCA3R3bzANBgkqhkiG9w0BAQwFAAOCAYEAybLXl6Tmy/3cMTNnf3mUg+ht
+lIF75PfrWE2rR3TShrD5OFGb+1IxN7HrLd8SXW3V4tyK9Tel9IFU1RPrVoWmWxpJ
+FQk2qQe4n+1WIsJl3YugBRmuFmEXfXx4fF/LUGm3sSHtSLel4qlLT8asm6LouVD8
+8GVWIeqab90NWauhgUAQATSpZS3vmpg34RTK6QDBvVl4/y92YQ34S+wHPSqA+/2B
++L0tUirz1YdvyZ3GVLjmu0FzN7zFRoInnw1xtXKgsLVKCUXiMOabWf9zSqttBuv9
+f+tJJvyqy6lLiKySDjM6s/J1eflDEhyy+4b6opCNB0TWx96JY2FLUFjo2h/mPRgF
+D7gJvmcCHTktrNdAdjUCFMu9025VINobQGtyG/1zXRBqSxwpnPEeeRhqxMJili6t
+pGKTCVcHeQqKJwQtJJiojYT9gl3Z492BbTa5waFW4V3k4cnR0w6GacP676QR5EQT
+rhGQftweCqYE/5YwZWcKxCgoC/N46TiBqiCj7xAA
+-----END CERTIFICATE REQUEST-----
diff --git a/cert/server/agg_openfl-test.internal.cloudapp.net.csr b/cert/server/agg_openfl-test.internal.cloudapp.net.csr
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIID5jCCAk4CAQAwLDEqMCgGA1UEAwwhb3BlbmZsLXRlc3QuaW50ZXJuYWwuY2xv
+dWRhcHAubmV0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAubHskKdo
+SwjwZNmtiuVDcWnldcir1ox6qkTq0iwnRz0Q0lDLZ3krekXSeauji/DGQ3mi+rDm
+N09k0bwfKys3Kv317GjBL52f18S7J8nRedB+/oIWc8psTO3lyHe7wGvOG/OV05oN
+RCeuaFVteYje7LhPQCXtfEM5vy3TaJdH/Mc8/52wV/PuKf+hVTnpK7zI3vXyFa3a
+744gvIQaRofL6iYm+mAiu2moEeVvJLDrf0ePWuYljaEQhW0ObRuPrL3KciU54Gvi
+g6QdHwGFHcIKSAa2UQFFK7bagBs/m0rQzfAWqot03j6p+eqjlnXIX9kxGf2Myu+Y
+T4VumriK+Scbyvd2BG+JMInXbPTbGdANDGU5T1nF6gZ+9IX1xtI3nsLD5OiNT/8C
+85OPSoqvL81Kq/j4ZGGTuFy7pIuH6PdQdzQnlaaw2Cpn6/1GvqOZDhQo8F6nFlg6
+OLKCmSoBl2Ft6uHG2LlN4DsPaaQWpyCz4t7XLKok47Bt6kDUumULOaZnAgMBAAGg
+dTBzBgkqhkiG9w0BCQ4xZjBkMAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYI
+KwYBBQUHAwEwDgYDVR0PAQH/BAQDAgWgMCwGA1UdEQQlMCOCIW9wZW5mbC10ZXN0
+LmludGVybmFsLmNsb3VkYXBwLm5ldDANBgkqhkiG9w0BAQwFAAOCAYEAkUkmThmT
+ohdkoLgwP7XMRL49GI/Wr09U1hr5g8kTkzJPfNgXhuCBxhq8aHfn9Pn8ivF0W3AT
+1OlCG36U/JEbVg3tl/z/DixUrc/E0Soty+SDYZvLNNdBEE8MMgCaFEwrRi+ZVC85
+VpAI80UWCR6NwbsnVZUIrilWW4VA6vtIAjT/1MW4fvpauOUP6erO+VkJUTwXxgek
+bT3goJcahOiFVXus14pNH2mn3/wrTH6ewgAAoWWfcrV8Tto0/Q/l9JwgAGiZPZIF
+2P2hHQl/SU6vEeZqSk1AVijYo6JW8zGc5xEdzxqbWIV5Mx/8nwuVw8sSXE2xctws
+V5TNqPe+wsUXVfdwLsvoQjgodR/6ZfgEidcUilh651AO3d68G4kcaemUfRAoK2ER
+nmj6KdRAUOvfMHY61bQR/7dDZl4FFWckTgjMnNg7Sz2dRY0YDp/qFEecWUTGncwj
+RelG6KDVS8fyg3qF+6a5dIUB2Jp1AhLhy4tSBu9D1E0rNJ+1mWJFXgH9
+-----END CERTIFICATE REQUEST-----
diff --git a/openfl/interface/collaborator.py b/openfl/interface/collaborator.py
@@ -68,6 +68,10 @@ def start_(plan, collaborator_name, data_config, secure):
         help='The data path to be associated with the collaborator')
 @option('-s', '--silent', help='Do not prompt', is_flag=True)
 def create_(collaborator_name, data_path, silent):
+    """Generate certificate request for the collaborator."""
+    create(collaborator_name, data_path, silent)
+
+def create(collaborator_name, data_path, silent):
     """Creates a user for an experiment."""
     if data_path and is_directory_traversal(data_path):
         echo('Data path is out of the openfl workspace scope.')

diff --git a/openfl/native/native.py b/openfl/native/native.py
@@ -203,7 +203,7 @@ def init(workspace_template: str = 'default', log_level: str = 'INFO',
         collaborator.create(
             col_name, str(data_path), silent=True)
         collaborator.generate_cert_request(
-            col_name, str(data_path), silent=True, skip_package=True)
+            col_name, silent=True, skip_package=True)
         collaborator.certify(col_name, silent=True)
         data_path += 1