From 2ddaba51d9008861076e79fb908088cf0531f379 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Tue, 8 Oct 2024 17:42:51 +0200 Subject: [PATCH] Added image loader --- docker/certs/server.crt | 19 +++++++++++++ docker/certs/server.key | 28 +++++++++++++++++++ ogcore.crt | 21 ++++++++++++++ ogcore.key | 28 +++++++++++++++++++ .../UDS/OrganizationalUnitController.php | 2 +- src/OpenApi/OpenApiFactory.php | 2 +- 6 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 docker/certs/server.crt create mode 100644 docker/certs/server.key create mode 100644 ogcore.crt create mode 100644 ogcore.key diff --git a/docker/certs/server.crt b/docker/certs/server.crt new file mode 100644 index 0000000..39e705b --- /dev/null +++ b/docker/certs/server.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDCTCCAfGgAwIBAgIUCESVK0sEqcpz40+nh0GMitq9VfIwDQYJKoZIhvcNAQEL +BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MTAwODExNTIyNFoXDTI1MTAw +ODExNTIyNFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAmtdlS7M7iB8HMPtwlHlXTegiGWL/xpvCvyb56kbrIjUk +2MsKzz/vhfdI+Jd/I8JKcAd+IN1bqyAUl9MjwFhFyIgFghNP6jLsN3n2C8ZIZl3u +CzTP4nlIHC5/MqwclxavxMM8uGMj2Ci9cub5RSJ2XTEmiEcV67hXdG+j3m8cBsVw +D2L9y9Fl4f+1BauiVtGotBRVQuaLlkqwPJPRCUDiLSOoIX43ZbHn7bbPJRG2eQtb +7fdhGkYUI4KqR7rvExR7E/EShp1k5m5pX8V0WW0pxigLVhQ6FSRudIyGoZ3PFgHp +5y4UA5jMjJtha4TeqYAy3+TyuoiU3T6cGsox9VmGhwIDAQABo1MwUTAdBgNVHQ4E +FgQUqSam/uMA2D2znG+yD4SSPwxfmOgwHwYDVR0jBBgwFoAUqSam/uMA2D2znG+y +D4SSPwxfmOgwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAevFz +ayQz7V/OlspIewLNC1msTcDmJEBDNYoQNzpLzzTR0+vww1O99nixCCJZm4UdaMbI +AL2mAbI94Hq2IewLbhLSTkzP6OpwE13rAZglDe8UFQweppDY4DzENdcHY4J2awS2 +frs9UFErcEqFktUH9PLVUOinmls1HGPKHUcEeLrIgbqM+S/4H4hWxfxaQIdFbL6b +K22fIXdagsc9//PsVf9zWaiUzkITjs8ue3XgXXNZioX/PL40UAMkimVdDDeg5vUK +Xtr5rVWKBxsrMCZrlvI0xpFX6VbCjMwG3x3wYRqsn0wmCTqqVCXzg4qYq8UZAcZM +WQplbeu2ShNvdToXVQ== +-----END CERTIFICATE----- diff --git a/docker/certs/server.key b/docker/certs/server.key new file mode 100644 index 0000000..1e2ccca --- /dev/null +++ b/docker/certs/server.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCa12VLszuIHwcw ++3CUeVdN6CIZYv/Gm8K/JvnqRusiNSTYywrPP++F90j4l38jwkpwB34g3VurIBSX +0yPAWEXIiAWCE0/qMuw3efYLxkhmXe4LNM/ieUgcLn8yrByXFq/Ewzy4YyPYKL1y +5vlFInZdMSaIRxXruFd0b6PebxwGxXAPYv3L0WXh/7UFq6JW0ai0FFVC5ouWSrA8 +k9EJQOItI6ghfjdlseftts8lEbZ5C1vt92EaRhQjgqpHuu8TFHsT8RKGnWTmbmlf +xXRZbSnGKAtWFDoVJG50jIahnc8WAennLhQDmMyMm2FrhN6pgDLf5PK6iJTdPpwa +yjH1WYaHAgMBAAECggEACQGMkD3GsXul25j8VX5wmq+Xms9nHheoLkhnkn35JikI +0XKPLeUY8DtPq2SFuMA6Znq2a4CZ2NcJq5epxYG83qresHqhaXdNxZ+aioPIE+rU +XM1/u+X0UO35aFVEvRr3h+PChTJVqY3GZcepFEwqre/yaaHCKiQziKpc/Hk3nEMf +ZfPpEqQqRh4tMwcG1BoPqj6q2E5h3XQZ2bNKPUa+mk28Xa4DsrBdWlVV2uIuIH0H +qqzoVcKds0mDcOgiYwCnYCgXK141fks6DS+1iesonzcPiNNtMzvM2bFtYRsUul9j +dcwNGmKtK10vCnb/q/YhhIu5mrZAhQtollJmOh4HIQKBgQDP7L4YQV/qgsaOaJh7 +OmrLTAz7DrImaq8vbbCnd4avXiLGZJ4uyHSWga7seqlK4WF0ZfIbjJ4+YojPsbni +0IoxNFgCtu1kz8t8KjpEyMuu5gZJYtI9O+QM9eRqXzUxBBOculm5e8k38v7DfpFJ +DycLEcjti9rJTvmtQYpxnZEv4QKBgQC+pJlX8XMcUpQHlV6xuvMtIFM2xJqwjnT9 +Qac0UkvlwFQrmKaWS6METHQLQosvimw7B7Ux2mwFZgzjriGwol+vJrMQaEU3F3jq +654NuwGX6HKFtGvzBXyvKjgERSdWrs6f7N7ng2eDcwcGpohG7bHrSGEHC24Ofl5Y +DKNSqNOjZwKBgQCpRClcxZu35c6OkEfRybS226qVl1kgPSlwivOM4Zkbmp7ks3Sy +0S1YeSpWCWVYODKF95gpJUiNsNl/e0fAhdR6Sgp76z9HGoKlCht1c6GdOFVV2MUe +ZGs6wdK5Zdh/lroAlRQGE+ezTHZp39eWimdWc5wHBhuOVmSbzwdNhuBzAQKBgE/C +l7FWgD16QxqFINAlEjZwDsCcMsfpYgLPJABc6goelFiFDjVVQce7oNVRKuBh/nQX +/nP0GTuM/ZmIMeovlO63tzUHGuY4uMs4drDx63G9u6Q63usXAZpbhIIs2I+IpUP9 +myirLnStfGQI6n0aV1TDvGxxGMORlTErYG1l2t3DAoGAZ8xdgLlXiND2vBYDT8WN +NozyhHYdCP5zP1WJLP6i4C6uLHJZ/HV7eSZ/aFlG5E+c9A53VF/J5BP1v3oob7Ul +eMOIpnlM8Velp6BeCAVKx/5IfaWDYIwdqxcEMHw5uFg84cCh7iGSaDcQaAgoTDd8 +8N9WV8piwfcZERkFbdFI70g= +-----END PRIVATE KEY----- diff --git a/ogcore.crt b/ogcore.crt new file mode 100644 index 0000000..072269f --- /dev/null +++ b/ogcore.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDYTCCAkmgAwIBAgIUZ2upHKcDRZdr6cW4FfCAe114LtgwDQYJKoZIhvcNAQEL +BQAwQDELMAkGA1UEBhMCRVMxDzANBgNVBAgMBk1hZHJpZDEPMA0GA1UEBwwGTWFk +cmlkMQ8wDQYDVQQKDAZRaW5kZWwwHhcNMjQxMDA4MTExMTMxWhcNMjUxMDA1MTEx +MTMxWjBAMQswCQYDVQQGEwJFUzEPMA0GA1UECAwGTWFkcmlkMQ8wDQYDVQQHDAZN +YWRyaWQxDzANBgNVBAoMBlFpbmRlbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAM9NWMylshHt6EZTyeZCWoCsuVYoKSP2+EgCn8ujPvA2K9dh2StccI7w +y2SsUEZN8pesDWit1Kt/2nXY1ec3RV/JQzF6h8qGgSST+pg02PbhTSRzEBi1DX+r +FRey/M/Wl5Uf2PtUyqVsbbt7+TFaymjdV2/pR5CFP5auVrZKe/KYoq8BNY+Lusl+ +rBa7YPDNKqfhwBDm2YL4ppIhAv17RgWvgBO2ZcXoFLF8PH0Qk1Wb0wQlJJWdmlyH +XF292Egl/Re1W8ci0T/3r/UidTypDSKPLJ2AXNlf5ZUSgbrzUItsXD/++Irnv9gG +LvqH+12u8HP2lQ5OAo1A6mrcEWW56l0CAwEAAaNTMFEwHQYDVR0OBBYEFEpxe7x9 +7/KeASrLnQiz5Jok/XC2MB8GA1UdIwQYMBaAFEpxe7x97/KeASrLnQiz5Jok/XC2 +MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBALRGOWaJqAl3AUvT +WVRK3P7PNXkD37ZXwAcqtf8G5GA/n5jMj9t8uwvH3Acq+UqSLf5OpynME5ZoI0gc +hzDDGOWp9+24VTnX2Sl8OmPbUvTuh7XMLY/A5CkKoNTEkpntPhYsxDSgJAKAgxGZ +LJ4cqbI0NZFMgUUWgb+ge4DE+MIX5VfLrak/pWGAoKzqXTobZ4+q9buvloGfkg6d +sQ9Rj72mpWdiwmL+AJ4A3IzpdcIphBtV5Jtqd2CgNGoid6/WLGuuSCHeIKTEqXiL +UczwgP1Hxu1z7kGC2iZiy46KVMnan6JJCyZUNsxk6LA6ECKOVlekNQV9pcs2vB2M +UAfYocI= +-----END CERTIFICATE----- diff --git a/ogcore.key b/ogcore.key new file mode 100644 index 0000000..9e5573c --- /dev/null +++ b/ogcore.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPTVjMpbIR7ehG +U8nmQlqArLlWKCkj9vhIAp/Loz7wNivXYdkrXHCO8MtkrFBGTfKXrA1ordSrf9p1 +2NXnN0VfyUMxeofKhoEkk/qYNNj24U0kcxAYtQ1/qxUXsvzP1peVH9j7VMqlbG27 +e/kxWspo3Vdv6UeQhT+Wrla2SnvymKKvATWPi7rJfqwWu2DwzSqn4cAQ5tmC+KaS +IQL9e0YFr4ATtmXF6BSxfDx9EJNVm9MEJSSVnZpch1xdvdhIJf0XtVvHItE/96/1 +InU8qQ0ijyydgFzZX+WVEoG681CLbFw//viK57/YBi76h/tdrvBz9pUOTgKNQOpq +3BFluepdAgMBAAECggEAJYdqqo3auW05DjZQCFv912qtmN/nZsfotdynwi15EPK1 +qCXiM3vmMrJ8F+ssEzY8U2IGAWvq4utgCNKrEtNKP2eHvxbgK3WDPrR9ev2iQ7uR +BCbChL6ORY0a4fH428WNJqWf2gxFLYJ+MSFmAR3fI/HiSPPSDWNaGjTQpOrCGq5c +57MpJ+7yPBV5lf+f0Z8MNgY1JnQ1dZ0AqcamkuP+/k6NETdolC7AF33M46EkVgDu +OSqNcRqmmMjYLAjAfVgtjBQ5XtH0Wp3tNa8W64GXGDMtOjiywjeMI7T8LHRgXaSH +HP6dGsYGDNWEvZpwpv67gi/xW+kj/vFx/QSe/DwRoQKBgQDn9JN11whTTOw2eztl +KTvYmSDEEA3CNZKzCrD8vuyKvmSeQsaZxMTMhfTtlzLt76SaqkIQqcXe1S5v3s3c +MCjzsX+0qisBSQaQpv7tFIc810rxmL0+o137eCY5HxW0kCuaClPyHjYq9kk/dO4k +M6TWkhxLckwAvdHGygqbmfwxrQKBgQDkyouXzSOAc1Un0rB1ysOQ7m7sY44PGJxq +mHdBg/KU3WyTxvq9p17ZmrpRmLd3ZJ9HPLWBQlqEW5csoA9K273tKQWwMjQa/ztv +51Qvib7/7gFHXOJXHz96CWSkfuXCLBsD1eTOW/gAd7fUwMWalph/jf6tFRkK4bCE +1VAH1PmRcQKBgFFwe72qDBBDN8RBLC9udMatrOVpxYrkiGc4X7+9wQtNocI3K8ed +YIN2nPI2XflQZHixQpTbJtAABVfd4GVou1gkf/QMsyC2ZQmwuFzBEmJ4LKX6vKcb +cMnz+2ee1F4bKFPjQGoH1XjsE/eltF8disiTcD/FF45DFz42fdb4D6XZAoGATlXH +O9+CA0353xu1TW9yTGJG2msvzZ1omNrBIk5yNWQm8+YSHfN7d1gR6TQ3xQpPus1f +e/VjFqRhe2cGNWRNgDEmgHCABKpVCHiVC33HRsuP5oY3/Qp26mri6auFMVl2mnaW +080LeeWDrLWgMtDTQAE3LL3niCFEFgcPUs8p8BECgYEAhQEHqCcdkdJ4Dlqrr/A2 +XkwLiOxr+KGfLYxNx4SCtmYREoP5CHgEj1QkFJyu2hiAprq0fNCTYqraHJU/gnWa ++MFGJLQnRAao/3jzYK9/KMEAHPHQC3MXFdlsbq2GIY3tfbHXusRPkfrHk0tbWT5V +Mo3wGFKMv2PfxKZ6Q+dxb4o= +-----END PRIVATE KEY----- diff --git a/src/Controller/UDS/OrganizationalUnitController.php b/src/Controller/UDS/OrganizationalUnitController.php index 3b1f502..af46e7d 100644 --- a/src/Controller/UDS/OrganizationalUnitController.php +++ b/src/Controller/UDS/OrganizationalUnitController.php @@ -42,7 +42,7 @@ class OrganizationalUnitController extends AbstractController } #[Route('/opengnsys/rest//ous/{centerId}/labs', methods: ['GET'])] - public function getClassrooms(Request $request, int $centerId): JsonResponse + public function getClassrooms(Request $request, string $centerId): JsonResponse { $classrooms = $this->entityManager ->getRepository(OrganizationalUnit::class) diff --git a/src/OpenApi/OpenApiFactory.php b/src/OpenApi/OpenApiFactory.php index 0d53a84..f15bec0 100644 --- a/src/OpenApi/OpenApiFactory.php +++ b/src/OpenApi/OpenApiFactory.php @@ -20,7 +20,7 @@ final readonly class OpenApiFactory implements OpenApiFactoryInterface $this->addRefreshToken($openApi); $this->addOgAgentEndpoints($openApi); - $this->addUDsEndpoints($openApi); + //$this->addUDsEndpoints($openApi); $this->addStatusEndpoint($openApi); $this->addInstallOgLiveWebhookEndpoint($openApi);