Fixes generation of certificates for subdomains

Author: chaptergy

.gitignore

@@ -4,4 +4,6 @@ dist
 *.egg-info
 __pycache__
 *.snap
-snap-constraints.txt
+snap-constraints.txt
+njalla.ini
+tmp/

README.md

@@ -48,6 +48,7 @@ snap connect certbot:plugin certbot-dns-njalla
 
       ```
       get-domain
+      list-records
       add-record
       remove-record
       ```
@@ -96,6 +97,8 @@ snap connect certbot:plugin certbot-dns-njalla
    Use `*.your-domain.com` if you want to generate it as a wildcard certificate.  
    Add additional options as required to specify an installation plugin etc.
 
+   You can use `--dns-njalla-propagation-seconds 30` to reduce the time it waits for DNS propagation to e.g. 30.
+
    Remember to use the `-i` flag if you want to use an additional installer plugin, like `-i apache` or `-i nginx`.
 
 ## Development

certbot_dns_njalla/dns_njalla.py

@@ -38,9 +38,20 @@ def _provider_name(self) -> str:
         return 'njalla'
 
     def _handle_http_error(self, e, domain_name: str) -> errors.PluginError:
+        # HTTP Errors are incorrectly thrown as a general error, so we need to handle both the same way
+        return self._handle_all_errors(e, domain_name)
+
+    def _handle_general_error(self, e, domain_name: str) -> errors.PluginError:
+        # HTTP Errors are incorrectly thrown as a general error, so we need to handle both the same way
+        return self._handle_all_errors(e, domain_name)
+
+    def _handle_all_errors(self, e, domain_name: str) -> errors.PluginError:
+        if str(e).startswith('403: Permission denied'):
+            return # Expected errors when zone name guess is wrong
+
         hint = None
-        if str(e).startswith('401 Client Error: Unauthorized for url:'):
-            hint = 'Is your API token value correct?'
+        if str(e).startswith('401:'):
+            hint = 'Does your token have the right permissions?'
 
         hint_disp = f' ({hint})' if hint else ''
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "certbot-dns-njalla"
-version = "2.0.1"
+version = "2.0.2"
 authors = [{ name = "chaptergy" }]
 license = {file = "LICENSE"}
 description = "Njalla DNS Authenticator plugin for Certbot"