X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/odin-cgi/blobdiff_plain/49e1be4cc948adf83e0e0024ee8b5a15890e0a7c..49bed39b1f7caa2bd957a1684c356751960c9fda:/lib/Odin.pm

diff --git a/lib/Odin.pm b/lib/Odin.pm
index bc5947e..1d50fe9 100644
--- a/lib/Odin.pm
+++ b/lib/Odin.pm
@@ -24,8 +24,8 @@ our $DSN = "dbi:Pg(pg_enable_utf8=>1):host=db";
 our $RETRY = 10;
 our @BACKOFF = (0.1, 10, 1.5, 0.5, 2.0);
 
-our $BASEURL = "http://odin.gg/";
-our $STATIC = "http://odin.gg/";
+our $BASEURL = "https://odin.gg/";
+our $STATIC = "https://odin.gg/static/";
 
 our $SHORTURL_PATH = "u";
 our $PASTEBIN_PATH = "p";
@@ -574,7 +574,7 @@ sub gen_redir_name ($$) {
 sub qualify_recip ($) {
   my ($r) = @_;
 
-  return $r =~ /\@/ || !defined $MAIL_QUALDOM ? $r : "$r\@$MAIL_QUALDOM";
+  return $r =~ /\@/ || !defined $MAIL_QUALDOM ? $r : "$r\@\%d";
 }
 
 sub check_fixup_redir ($) {
@@ -586,6 +586,13 @@ sub check_fixup_redir ($) {
   }
 }
 
+sub subst_recip ($$) {
+  my ($l, $r) = @_;
+  my %d = ('%' => '%', 'l' => $l, 'd' => $MAIL_QUALDOM);
+  $r =~ s{%([%a-z])}{$d{$1} // fail "undefined substitution `\%$1'"}eg;
+  return $r;
+}
+
 sub new_redir ($$\%;$) {
   my ($dom, $gen, $r, $n) = @_;
   my $db = open_db;
@@ -600,7 +607,7 @@ sub new_redir ($$\%;$) {
       insert_record $db, "odin_mailredir",
 	lpart => $l, dom => $dom, st => 'live',
 	owner => $WHO, creator => $WHO,
-	recip => $r->{recip} // qualify_recip $Odin::WHO,
+	recip => subst_recip($l, $r->{recip} // qualify_recip $Odin::WHO),
 	expire => $r->{expire} // -1,
 	comment => $r->{comment} // "";
       push @l, $l;
@@ -621,7 +628,7 @@ sub reserve_redir ($$$) {
     for (my $i = 0; $i < $n; $i++) { push @l, gen_redir_name $db, $gen; }
     for my $l (@l) {
       insert_record $db, "odin_mailredir",
-	lpart => $l, dom => $dom, owner => $WHO,
+	lpart => $l, dom => $dom, owner => $WHO, creator => $WHO,
 	st => 'reserved', expire => $NOW + $MAIL_AGEMAX_RESV;
     }
     check_redir_limits $db;
@@ -688,7 +695,8 @@ sub modify_redir ($\%@) {
 	  WHERE lpart = ? AND dom = ? AND owner = ?", undef,
 	 $l, $dom, $WHO);
       if (!defined $recip) { Odin::fail "unknown local part `$l'"; }
-      elsif ($recip eq "") { $r{recip} //= qualify_recip $WHO; }
+      elsif ($recip eq "" || defined $r{recip})
+	{ $r{recip} = subst_recip $l, $r{recip} // qualify_recip $WHO; }
       if ($st ne "live") { $r{st} = "live"; $r{expire} //= -1; }
       my @var = ();
       my @val = ();