Embed Notice

HTML Code

<blockquote style="position: relative; padding-left: 55px;"><section><a href="https://mk.absturztau.be/notes/9zwwsducidx900hc">niconiconi (niconiconi@mk.absturztau.be)'s status on Tuesday, 29-Oct-2024 03:29:13 JST</a><a href="https://mk.absturztau.be/@niconiconi" title="niconiconi@mk.absturztau.be"><img src="https://gnusocial.jp/theme/gnusocialjp/default-avatar-stream.png" width="48" height="48" alt="niconiconi" style="position: absolute; left: 0; top: 0;">niconiconi</a><div><a href="https://mk.absturztau.be/notes/9zwrmeamlvkl01lt" rel="in-reply-to">in reply to</a></div></section><article><p>Just wrote a patch, untested. Is it really that simple?</p></article><footer><a rel="bookmark" href="https://gnusocial.jp/conversation/3894878#notice-7613770">In conversation</a><time datetime="2024-10-29T03:29:13+09:00" title="Tuesday, 29-Oct-2024 03:29:13 JST">about 4 months ago</time> <span>from <span><a href="https://mk.absturztau.be/notes/9zwwsducidx900hc" rel="external" title="Sent from mk.absturztau.be via ActivityPub">mk.absturztau.be</a></span></span><a href="https://mk.absturztau.be/notes/9zwwsducidx900hc">permalink</a><h4>Attachments</h4><ol><li><label><a rel="external" href="https://gnusocial.jp/attachment/3367164">diff --git a/filter-dkimsign.8 b/filter-dkimsign.8
index 024829c..2d91d5c 100644
--- a/filter-dkimsign.8
+++ b/filter-dkimsign.8
@@ -88,6 +88,8 @@ The selector within the _domainkey subdomain of
 where the public key can be found.
 .It Fl t
 Add the time of signing to the dkim header.
+.It Fl u
+Only sign mails from authenticated users.
 .It Fl x Ar seconds
 Add the amount of
 .Ar seconds
diff --git a/main.c b/main.c
index 2961793..2f99aad 100644
--- a/main.c
+++ b/main.c
@@ -86,6 +86,7 @@ static int canonbody = CANON_SIMPLE;
 static int addtime = 0;
 static long long addexpire = 0;
 static int addheaders = 0;
+static int authonly = 0; static char **domain = NULL;
 static size_t ndomains = 0;
@@ -208,6 +209,9 @@ main(int argc, char *argv[])
                case 't':
                        addtime = 1;
                        break;
+               case 'u':
+                       authonly = 1;
+                       break;
                case 'x':
                        addexpire = strtonum(optarg, 1, INT64_MAX, &amp;errstr);
                        if (addexpire == 0)
@@ -260,6 +264,9 @@ dkim_dataline(struct osmtpd_ctx *ctx, const char *line)
        char *linedup;
        size_t linelen;+       if (authonly &amp;&amp; ctx-&gt;username == NULL) {
+               return;
+       }
        if (message-&gt;err) {
                if (line[0] == '.' &amp;&amp; line[1] =='\0')
                        osmtpd_filter_dataline(ctx, ".");
@@ -960,7 +967,7 @@ dkim_signature_need(struct dkim_message *message, size_t len)
 __dead void
 usage(void)
 {
-       fprintf(stderr, "usage: filter-dkimsign [-tz] [-a signalg] "
+       fprintf(stderr, "usage: filter-dkimsign [-tzu] [-a signalg] "
            "[-c canonicalization] \n    [-h headerfields]"
            "[-x seconds] -D file -d domain -k keyfile -s selector\n");
        exit(1);
~</a></label><br><a href="https://misskey-taube.s3.eu-central-1.wasabisys.com/files/83d04613-62e2-4a06-ba01-865523b88a00.webp" rel="external">https://misskey-taube.s3.eu-central-1.wasabisys.com/files/83d04613-62e2-4a06-ba01-865523b88a00.webp</a></li></ol></footer></blockquote>

Corresponding Notice

Embed this notice
niconiconi (niconiconi@mk.absturztau.be)'s status on Tuesday, 29-Oct-2024 03:29:13 JST niconiconi
in reply to
Just wrote a patch, untested. Is it really that simple?
In conversationabout 4 months ago from mk.absturztau.bepermalink
Attachments
1. diff --git a/filter-dkimsign.8 b/filter-dkimsign.8 index 024829c..2d91d5c 100644 --- a/filter-dkimsign.8 +++ b/filter-dkimsign.8 @@ -88,6 +88,8 @@ The selector within the _domainkey subdomain of where the public key can be found. .It Fl t Add the time of signing to the dkim header. +.It Fl u +Only sign mails from authenticated users. .It Fl x Ar seconds Add the amount of .Ar seconds diff --git a/main.c b/main.c index 2961793..2f99aad 100644 --- a/main.c +++ b/main.c @@ -86,6 +86,7 @@ static int canonbody = CANON_SIMPLE; static int addtime = 0; static long long addexpire = 0; static int addheaders = 0; +static int authonly = 0; static char **domain = NULL; static size_t ndomains = 0; @@ -208,6 +209,9 @@ main(int argc, char *argv[]) case 't': addtime = 1; break; + case 'u': + authonly = 1; + break; case 'x': addexpire = strtonum(optarg, 1, INT64_MAX, &errstr); if (addexpire == 0) @@ -260,6 +264,9 @@ dkim_dataline(struct osmtpd_ctx *ctx, const char *line) char *linedup; size_t linelen; + if (authonly && ctx->username == NULL) { + return; + } if (message->err) { if (line[0] == '.' && line[1] =='\0') osmtpd_filter_dataline(ctx, "."); @@ -960,7 +967,7 @@ dkim_signature_need(struct dkim_message *message, size_t len) __dead void usage(void) { - fprintf(stderr, "usage: filter-dkimsign [-tz] [-a signalg] " + fprintf(stderr, "usage: filter-dkimsign [-tzu] [-a signalg] " "[-c canonicalization] \n [-h headerfields]" "[-x seconds] -D file -d domain -k keyfile -s selector\n"); exit(1); ~
  https://misskey-taube.s3.eu-central-1.wasabisys.com/files/83d04613-62e2-4a06-ba01-865523b88a00.webp

Public

Embed Notice

HTML Code

Corresponding Notice