fix dkim path

Author: dmetzner

.dkim/public.key

@@ -1,9 +1,14 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAva7UBSxlTA1kGKoDjjSp
-5dwwLOKmWJJTkMfu3Vlbwd4HxStIr9OQE+EAINdLjOn3qeUZf6Lrh9ZGs1dcCSjg
-KN37m1r0zDsWBN8XYI7pqo13SmY8TYYcr4mVpgo951Lmk2JccVO5kpocwxASmRKd
-MzOkifhtegxzAYt04IFtQLOK7vyh0DzncWZaxxfb5HtMPRdgTshEiYVHcd+8AXPv
-cE4PuidW95vO3hQ+Y/JmSDSnGbo9ys/AVOGaWK/1YUVIWtlCPTjSxOWkMNRrSJbp
-RmYgm+5SbHARXFWsbAvYf/Wui/W1NNL3vOK8lphbCVx9GctHwzIqJR4tztriJS1U
-rQIDAQAB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0zYP/x+dz4PjmLcA6DvP
+7jx+ClkSg/u86tXbwBB75JG63/PKKw/811GaoUjV8gSn95/59IoYJE4c06imjMTk
+zaThWeQ9p1g3vuN0nVInnAXhMMt0ApOoBe+mlDL5+KcJaDa1ddmLO+vEJybgbF9B
+03Jj31vdvAuPgiA7UejyhhUp/k5er/0kSqBmyVikSuJkT+NITUn7LJtGEaYr1tvA
+h/lyeYTUKDrdWf7r0eyyXSLy7X2jU3nt0kJrcr6pREdyAkPCnsyWFxgBHMSxoFV6
+RukkAMzs82x5dt6Fxuu9tQnyJ0Tv0C9kEZ0PmEIF7HU8rla7D0e5GHRC7zElyUGo
+9XHnydfpbUerGDz5Vvb4FgWNYegkyaqhrcGDPfl0LpXw7/eRCCiqwptmn2w3GUAq
+7GnPoYD/o8tksxoh2Qrq04m0fJG7SsMOkYNI7W0rElyDEIlj7PgOUUPzhZ8Uqbj4
+ou0olB6rNthWmRlS9F3XNcBYPljH0VSJiypvj8uRqMzkM0j7yl0IzBzzIc2Yzd5o
+sB/T0FwAyqX3ftza2MBXqDNPEpBH/85MtNg1s2yva5yAr6rs3B8sxwewrO39iDuf
+6eJ397KWFk9F+74projtHerC0AGu6vieUWHb7bxm66SOAhvXvz86qR5viSsHoMtv
+V08WGzuoEEeQAVn2X3QcrSsCAwEAAQ==
 -----END PUBLIC KEY-----

config/services.yaml

@@ -45,6 +45,7 @@ parameters:
   catrobat.upload.temp.path:            "resources/tmp/uploads/"
   es_host:                              "%env(ES_HOST)%"
   es_port:                              "%env(ES_PORT)%"
+  dkim.private.key:                     "%kernel.project_dir%/.dkim/private.key"
 
   #      This can drastically improve DX by reducing the time to load classes
   container.dumper.inline_class_loader: true
@@ -77,6 +78,7 @@ services:
       $program_finder: '@fos_elastica.finder.app_program'
       $user_finder: '@fos_elastica.finder.app_user'
       $refresh_token_ttl: '%lexik_jwt_authentication.token_ttl%'
+      $dkim_private_key_path: "%dkim.private.key%"
 
 
   # ====================================================================================================================

deploy.php

@@ -52,7 +52,7 @@
     'var/cache',
     'var/log',
     'var/sessions',
-    'public/resources'
+    'public/resources',
   ]);
 
 // Symfony executable and variable directories

src/System/Mail/MailerAdapter.php

@@ -15,11 +15,16 @@ class MailerAdapter
 {
   protected MailerInterface $mailer;
   protected LoggerInterface $logger;
+  protected string $dkim_private_key_path;
 
-  public function __construct(MailerInterface $mailer, LoggerInterface $logger)
-  {
+  public function __construct(
+    MailerInterface $mailer,
+    LoggerInterface $logger,
+    string $dkim_private_key_path // bind in services!
+  ) {
     $this->mailer = $mailer;
     $this->logger = $logger;
+    $this->dkim_private_key_path = $dkim_private_key_path;
   }
 
   public function send(string $to, string $subject, string $template, array $context = []): void
@@ -43,12 +48,10 @@ protected function buildEmail(string $to, string $subject, string $template, arr
   protected function signEmail(Message $email): Message
   {
     try {
-      $signer = new DkimSigner('.dkim/private.key', 'catrob.at', 'sf');
-
-      return $signer->sign($email);
+      return (new DkimSigner($this->dkim_private_key_path, 'catrob.at', 'sf'))->sign($email);
     } catch (InvalidArgumentException $e) {
       if ('prod' === $_ENV['APP_ENV']) {
-        $this->logger->error('Private dkim key is missing: '.$e->getMessage());
+        $this->logger->error("Private dkim key is missing ({$this->dkim_private_key_path}): ".$e->getMessage());
       }
 
       return $email;