No ext_urls

[public-inbox.git] / lib / PublicInbox / URIimap.pm

diff --git a/lib/PublicInbox/URIimap.pm b/lib/PublicInbox/URIimap.pm
index dc19346815556095f8ae056033f819d20b318905..816449143e75bc10e0fe4e99fc1ab19aa01663f5 100644 (file)
--- a/lib/PublicInbox/URIimap.pm
+++ b/lib/PublicInbox/URIimap.pm
@@ -12,11 +12,14 @@
 # RFC 2192 also describes ";TYPE=<list_type>"
 package PublicInbox::URIimap;
 use strict;
+use v5.10.1;
 use URI::Split qw(uri_split uri_join); # part of URI
-use URI::Escape qw(uri_unescape);
+use URI::Escape qw(uri_unescape uri_escape);
 use overload '""' => \&as_string;
 
 my %default_ports = (imap => 143, imaps => 993);
+# for enc-auth-type and enc-user in RFC 5092
+my $achar = qr/[A-Za-z0-9%\-_\.\!\$'\(\)\+\,\&\=\*]+/;
 
 sub new {
        my ($class, $url) = @_;
@@ -30,6 +33,9 @@ sub canonical {
        my ($scheme, $auth, $path, $query, $_frag) = uri_split($$self);
        $path =~ s!\A/+!/!; # excessive leading slash
 
+       # upper-case uidvalidity= and uid= parameter names
+       $path =~ s/;([^=]+)=([^;]*)/;\U$1\E=$2/g;
+
        # lowercase the host portion
        $auth =~ s#\A(.*@)?(.*?)(?::([0-9]+))?\z#
                my $ret = ($1//'').lc($2);
@@ -57,7 +63,7 @@ sub path {
        my ($self) = @_;
        my (undef, undef, $path) = uri_split($$self);
        $path =~ s!\A/+!!;
-       $path =~ s![/;].*\z!!; # [;UIDVALIDITY=nz-number]/;UID=nz-number
+       $path =~ s!/?;.*\z!!; # [;UIDVALIDITY=nz-number]/;UID=nz-number
        $path eq '' ? undef : $path;
 }
 
@@ -80,21 +86,23 @@ sub uidvalidity { # read/write
                $$self = uri_join($scheme, $auth, $path, $query, $frag);
        }
        $path =~ s!\A/+!!;
-       $path =~ m!\A[^;/]+;UIDVALIDITY=([1-9][0-9]*)\b!i ? ($1 + 0) : undef;
+       $path =~ m!\A[^;]+;UIDVALIDITY=([1-9][0-9]*)\b!i ?
+               ($1 + 0) : undef;
 }
 
-sub iuid {
+sub uid {
        my ($self, $val) = @_;
        my ($scheme, $auth, $path, $query, $frag) = uri_split($$self);
-       if (defined $val) {
-               if ($path =~ s!/;UID=[^;/]*\b!/;UID=$val!i) {
-                       # s// already changed it
-               } else { # both s// failed, so just append
-                       $path .= ";UID=$val";
+       if (scalar(@_) == 2) {
+               if (!defined $val) {
+                       $path =~ s!/;UID=[^;/]*\b!!i;
+               } else {
+                       $path =~ s!/;UID=[^;/]*\b!/;UID=$val!i or
+                               $path .= "/;UID=$val";
                }
                $$self = uri_join($scheme, $auth, $path, $query);
        }
-       $path =~ m!\A/[^/;]+(?:;UIDVALIDITY=[^;/]+)?/;UID=([1-9][0-9]*)\b!i ?
+       $path =~ m!\A/[^;]+(?:;UIDVALIDITY=[^;/]+)?/;UID=([1-9][0-9]*)\b!i ?
                ($1 + 0) : undef;
 }
 
@@ -111,12 +119,34 @@ sub authority {
 }
 
 sub user {
-       my ($self) = @_;
-       my (undef, $auth) = uri_split($$self);
-       $auth =~ s/@.*\z// or return undef; # drop host:port
-       $auth =~ s/;.*\z//; # drop ;AUTH=...
-       $auth =~ s/:.*\z//; # drop password
-       uri_unescape($auth);
+       my ($self, $val) = @_;
+       my ($scheme, $auth, $path, $query) = uri_split($$self);
+       my $at_host_port;
+       $auth =~ s/(@.*)\z// and $at_host_port = $1; # stash host:port for now
+       if (scalar(@_) == 2) { # set, this clobbers password, too
+               if (defined $val) {
+                       my $uval = uri_escape($val);
+                       if (defined($at_host_port)) {
+                               $auth =~ s!\A.*?(;AUTH=$achar).*!$uval$1!ix
+                                       or $auth = $uval;
+                       } else {
+                               substr($auth, 0, 0) = "$uval@";
+                       }
+               } elsif (defined($at_host_port)) { # clobber
+                       $auth =~ s!\A.*?(;AUTH=$achar).*!$1!i or $auth = '';
+                       if ($at_host_port && $auth eq '') {
+                               $at_host_port =~ s/\A\@//;
+                       }
+               }
+               $at_host_port //= '';
+               $$self = uri_join($scheme, $auth.$at_host_port, $path, $query);
+               $val;
+       } else { # read-only
+               $at_host_port // return undef; # explicit undef for scalar
+               $auth =~ s/;.*\z//; # drop ;AUTH=...
+               $auth =~ s/:.*\z//; # drop password
+               $auth eq '' ? undef : uri_unescape($auth);
+       }
 }
 
 sub password {
@@ -128,10 +158,32 @@ sub password {
 }
 
 sub auth {
-       my ($self) = @_;
-       my (undef, $auth) = uri_split($$self);
-       $auth =~ s/@.*\z//; # drop host:port
-       $auth =~ /;AUTH=(.+)\z/i ? uri_unescape($1) : undef;
+       my ($self, $val) = @_;
+       my ($scheme, $auth, $path, $query) = uri_split($$self);
+       my $at_host_port;
+       $auth =~ s/(@.*)\z// and $at_host_port = $1; # stash host:port for now
+       if (scalar(@_) == 2) {
+               if (defined $val) {
+                       my $uval = uri_escape($val);
+                       if ($auth =~ s!;AUTH=$achar!;AUTH=$uval!ix) {
+                               # replaced existing
+                       } elsif (defined($at_host_port)) {
+                               $auth .= ";AUTH=$uval";
+                       } else {
+                               substr($auth, 0, 0) = ";AUTH=$uval@";
+                       }
+               } else { # clobber
+                       $auth =~ s!;AUTH=$achar!!i;
+                       if ($at_host_port && $auth eq '') {
+                               $at_host_port =~ s/\A\@//;
+                       }
+               }
+               $at_host_port //= '';
+               $$self = uri_join($scheme, $auth.$at_host_port, $path, $query);
+               $val;
+       } else { # read-only
+               $auth =~ /;AUTH=(.+)\z/i ? uri_unescape($1) : undef;
+       }
 }
 
 sub scheme {
@@ -141,4 +193,6 @@ sub scheme {
 
 sub as_string { ${$_[0]} }
 
+sub clone { ref($_[0])->new(as_string($_[0])) }
+
 1;