Merge branch 'beta' into production

* beta:
  Update POT files using the production database
  Update translations from Transifex
  Increase CAA bucket creation timeout to 30s
  Update POT files using the production database
  Update translations from Transifex
  MBS-11598: Do not generate image link if we don't have a suffix (metabrainz#2069)
  MBS-11590: Standardize display of empty fields in cover art edits (metabrainz#2076)
  MBS-11587: Block smart links: hypel.ink (metabrainz#2077)
  MBS-11612: Restore link to genre/delete to genre sidebar
  MBS-11620: Sort results of admin's search_by_email tool newest first
  MBS-11619: Ignore periods and +tags in e-mail admin searches
  MBS-11604: Add genre name to genre index title (metabrainz#2071)
  MBS-11611: Do not keep/add trailing slash in OC ReMix URLs (metabrainz#2072)
  MBS-10899: Report for releases with catnos that look like ISRCs (metabrainz#2067)
  Ensure CAA item ownership during upload process
  Check for valid mime_type in /ws/js/cover-art-upload
  Check for login in /ws/js/cover-art-upload
  Update POT files using the production database
  Put l() string on one line to avoid \n on .pot
  Update translations from Transifex
  MBS-9259: Add help section for the track parser (metabrainz#2046)
  Removing no longer needed '' defaults
  MBS-11550: Move PostParameters to static/scripts for translation (metabrainz#2032)
  MBS-11571: Warn about e-mail as a username (metabrainz#2049)
  MBS-11573: Load collections for ratings sidebars (metabrainz#2052)
  MBS-1588: Better errors for invalid CD TOC (metabrainz#2056)
  MBS-9251: Display ended places differently on the map (metabrainz#2051)
  MBBE-31: Remove now unneeded old RA checks (metabrainz#2028)
  MBS-11546: Allow Resident Advisor /exchange URLs for releases  (metabrainz#2025)
  MBS-11603: Finetune DNB validation (metabrainz#2070)
  Use addColonText for Tracklist header
  Ensure privileges are encoded as a number
  Fix catalyst warning: don't try to trim/sanitize undef "strings"
  Pass public editor privs when converting editor to JSON
  Update the link to edit search help
  MBS-9376: Indicate that edit searches can be bookmarked + link docs
  MBS-11559: Specify tracklist is empty in Remove medium edits

Author: reosarevok

contrib/ssssss.psgi

@@ -41,6 +41,9 @@ use Plack::Request;
 use Plack::Response;
 use Log::Dispatch;
 
+use lib "$FindBin::Bin/../lib";
+use DBDefs;
+
 my $log = Log::Dispatch->new(outputs => [[ 'Screen', min_level => 'info' ]] );
 my $imgext = 'gif|jpg|pdf|png';
 my $ssssss_storage = $ENV{SSSSSS_STORAGE}
@@ -72,6 +75,16 @@ sub create_bucket
     return $bucketdir;
 }
 
+sub bucket_exists
+{
+    my $bucket = shift;
+    my $bucketdir = catfile($ssssss_storage, $bucket);
+    if (-d $bucketdir) {
+        return 1;
+    }
+    return 0;
+}
+
 sub handle_options
 {
     my $response = shift->new_response(200);
@@ -80,17 +93,53 @@ sub handle_options
     return $response;
 }
 
+sub check_authorization_header
+{
+    my ($request) = @_;
+    my $auth = $request->header('authorization');
+
+    my ($user, $pass) = $auth =~ /^LOW ([^:]+):(.+)$/;
+    if (
+        !defined $user ||
+        !defined $pass ||
+        $user ne DBDefs->COVER_ART_ARCHIVE_ACCESS_KEY ||
+        $pass ne DBDefs->COVER_ART_ARCHIVE_SECRET_KEY
+    ) {
+        my $response = $request->new_response(403);
+        $response->content_type('text/xml');
+        $response->body(q{<?xml version='1.0' encoding='UTF-8'?>
+            <Error><Code>AccessDenied</Code></Error>});
+        return $response;
+    }
+}
+
 sub handle_put
 {
     my ($request) = @_;
 
-    my $bucketdir = create_bucket($request->path_info);
-    my $dest = catfile($bucketdir, $request->param('file'));
-    $log->info("PUT, storing upload at $dest\n");
+    my $response = check_authorization_header($request);
+    if ($response) {
+        return $response;
+    }
 
-    open(my $fh, ">", $dest);
-    print $fh $request->content;
-    close($fh);
+    my $file = $request->param('file');
+    if ($file) {
+        my $bucketdir = create_bucket($request->path_info);
+        my $dest = catfile($bucketdir, $file);
+        $log->info("PUT, storing upload at $dest\n");
+
+        open(my $fh, ">", $dest);
+        print $fh $request->content;
+        close($fh);
+    } elsif (bucket_exists($request->path_info)) {
+        $response = $request->new_response(409);
+        $response->content_type('text/xml');
+        $response->body(q{<?xml version='1.0' encoding='UTF-8'?>
+            <Error><Code>BucketAlreadyExists</Code></Error>});
+        return $response;
+    } else {
+        create_bucket($request->path_info);
+    }
 
     return $request->new_response(204);
 }
@@ -149,7 +198,22 @@ my %mime_types = (
 sub handle_get {
     my ($request) = @_;
 
-    my $filename = catfile($ssssss_storage, $request->path_info);
+    my $path_info = $request->path_info;
+
+    # Simulate the only bits from
+    # https://archive.org/services/docs/api/metadata.html that we need.
+    #
+    # This doesn't exactly belong in an "S3 simulator" service, but
+    # it's simpler to have it here than to create a whole 'nother file
+    # that has to run on a different port.
+    if ($path_info =~ m{^/metadata/}) {
+        my $response = $request->new_response(200);
+        $response->content_type('application/json; charset=UTF-8');
+        $response->body(q({"is_dark":false,"metadata":{"uploader":"[email protected]"}}));
+        return $response;
+    }
+
+    my $filename = catfile($ssssss_storage, $path_info);
 
     if (-f $filename) {
         my ($ext) = $filename =~ m/\.($imgext)$/;

lib/DBDefs/Default.pm

@@ -359,6 +359,7 @@ sub COVER_ART_ARCHIVE_SECRET_KEY { };
 sub COVER_ART_ARCHIVE_UPLOAD_PREFIXER { shift; sprintf("//%s.s3.us.archive.org/", shift) };
 sub COVER_ART_ARCHIVE_DOWNLOAD_PREFIX { "//coverartarchive.org" };
 sub COVER_ART_ARCHIVE_IA_DOWNLOAD_PREFIX { '//archive.org/download' };
+sub COVER_ART_ARCHIVE_IA_METADATA_PREFIX { 'https://archive.org/metadata' };
 
 # Mapbox access token must be set to display area/place maps.
 sub MAPBOX_MAP_ID { 'mapbox/streets-v11' }

lib/MusicBrainz/Server/Constants.pm

@@ -37,7 +37,7 @@ our %EXPORT_TAGS = (
     vote               => _get(qr/^VOTE_/),
     edit_status        => _get(qr/^STATUS_/),
     access_scope       => _get(qr/^ACCESS_SCOPE_/),
-    privileges         => _get(qr/_FLAG$/),
+    privileges         => _get(qr/_FLAGS?$/),
     language_frequency => _get(qr/^LANGUAGE_FREQUENCY/),
     script_frequency   => _get(qr/^SCRIPT_FREQUENCY/),
     election_status => [
@@ -345,6 +345,14 @@ Readonly our $LOCATION_EDITOR_FLAG          => 256;
 Readonly our $BANNER_EDITOR_FLAG            => 512;
 Readonly our $EDITING_DISABLED_FLAG         => 1024;
 Readonly our $ADDING_NOTES_DISABLED_FLAG    => 2048;
+# If you update this, also update root/utility/sanitizedEditor.js
+Readonly our $PUBLIC_PRIVILEGE_FLAGS        => $AUTO_EDITOR_FLAG &
+                                               $BOT_FLAG &
+                                               $RELATIONSHIP_EDITOR_FLAG &
+                                               $WIKI_TRANSCLUSION_FLAG &
+                                               $ACCOUNT_ADMIN_FLAG &
+                                               $LOCATION_EDITOR_FLAG &
+                                               $BANNER_EDITOR_FLAG;
 
 Readonly our $ELECTION_VOTE_NO      => -1;
 Readonly our $ELECTION_VOTE_ABSTAIN => 0;

lib/MusicBrainz/Server/Controller/Artist.pm

@@ -541,7 +541,7 @@ sub releases : Chained('load')
     );
 }
 
-after [qw( show collections details tags aliases subscribers releases recordings works events relationships )] => sub {
+after [qw( show collections details tags ratings aliases subscribers releases recordings works events relationships )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };

lib/MusicBrainz/Server/Controller/CDTOC.pm

@@ -158,7 +158,8 @@ sub attach : Local DenyWhenReadonly Edit
     my $cdtoc = MusicBrainz::Server::Entity::CDTOC->new_from_toc($toc)
         or $self->error(
             $c, status => HTTP_BAD_REQUEST,
-            message => l('The provided CD TOC is not valid')
+            message => l(
+                'The provided CD TOC is not valid. This is probably an issue with the software you used to generate it. Try again and please report the error to your software maker if it persists, including the technical information below.')
         );
 
     $c->stash( cdtoc => $cdtoc );
@@ -351,7 +352,7 @@ sub move : Local Edit
     my $medium_cdtoc = $c->model('MediumCDTOC')->get_by_id($medium_cdtoc_id)
         or $self->error(
             $c, status => HTTP_BAD_REQUEST,
-            message => l('The provided CD TOC is not valid')
+            message => l('The provided CD TOC ID doesn’t exist.')
         );
 
     $c->model('CDTOC')->load($medium_cdtoc);

lib/MusicBrainz/Server/Controller/Event.pm

@@ -52,7 +52,7 @@ after 'load' => sub {
 };
 
 # Stuff that has the side bar and thus needs to display collection information
-after [qw( show collections details tags aliases )] => sub {
+after [qw( show collections details tags ratings aliases )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };

lib/MusicBrainz/Server/Controller/Genre.pm

@@ -15,6 +15,15 @@ with 'MusicBrainz::Server::Controller::Role::Details';
 
 sub base : Chained('/') PathPart('genre') CaptureArgs(0) { }
 
+after 'load' => sub {
+    my ($self, $c) = @_;
+    my $entity_name = $self->{entity_name};
+    my $entity = $c->stash->{ $entity_name };
+    $c->stash(
+        can_delete => $c->model('Genre')->can_delete($entity->id)
+    );
+};
+
 sub show : PathPart('') Chained('load') {
     my ($self, $c) = @_;
 

lib/MusicBrainz/Server/Controller/Label.pm

@@ -157,7 +157,7 @@ sub relationships : Chained('load') PathPart('relationships') {
     );
 }
 
-after [qw( show collections details tags aliases subscribers relationships )] => sub {
+after [qw( show collections details tags ratings aliases subscribers relationships )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };

lib/MusicBrainz/Server/Controller/Recording.pm

@@ -141,7 +141,7 @@ sub fingerprints : Chained('load') PathPart('fingerprints') {
 }
 
 # Stuff that has the sidebar and needs collection info
-after [qw( show collections details tags aliases fingerprints )] => sub {
+after [qw( show collections details tags ratings aliases fingerprints )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };

lib/MusicBrainz/Server/Controller/Release.pm

@@ -263,6 +263,10 @@ sub add_cover_art : Chained('load') PathPart('add-cover-art') Edit {
         }
     );
 
+    my $accept = $c->req->header('Accept');
+    my $returning_json = defined $accept &&
+        $accept =~ m{\bapplication/json\b};
+
     if ($c->form_posted_and_valid($form)) {
         $c->model('MB')->with_transaction(sub {
             $self->_insert_edit(
@@ -280,8 +284,17 @@ sub add_cover_art : Chained('load') PathPart('add-cover-art') Edit {
             );
         });
 
-        $c->response->redirect($c->uri_for_action('/release/cover_art', [ $entity->gid ]));
-        $c->detach;
+        unless ($returning_json) {
+            $c->response->redirect($c->uri_for_action('/release/cover_art', [ $entity->gid ]));
+            $c->detach;
+        }
+    } elsif ($c->form_posted) {
+        $c->response->status(500);
+    }
+
+    if ($returning_json) {
+        $c->response->body($c->json_utf8->encode($form->TO_JSON));
+        $c->response->content_type('application/json; charset=utf-8');
     }
 }
 

lib/MusicBrainz/Server/Controller/ReleaseEditor.pm

@@ -393,7 +393,7 @@ sub _seeded_label
         $result->{label} = { name => trim($name) };
     }
 
-    $result->{catalogNumber} = trim($params->{catalog_number} // '');
+    $result->{catalogNumber} = trim($params->{catalog_number});
     return $result;
 }
 
@@ -542,7 +542,7 @@ sub _seeded_artist_credit_name
     my $result = {};
 
     my $name = _seeded_string($params->{name}, "$field_name.name", $errors);
-    $result->{name} = trim($name // '');
+    $result->{name} = trim($name);
 
     if (my $gid = $params->{mbid}) {
         my $entity = $c->model('Artist')->get_by_gid($gid);
@@ -556,7 +556,7 @@ sub _seeded_artist_credit_name
     }
 
     my $join = _seeded_string($params->{join_phrase}, "$field_name.join_phrase", $errors);
-    $result->{joinPhrase} = sanitize($join // '');
+    $result->{joinPhrase} = sanitize($join);
 
     $result->{artist} //= _seeded_hash($c, \&_seeded_artist, $params->{artist},
         "$field_name.artist", $errors);

lib/MusicBrainz/Server/Controller/ReleaseGroup.pm

@@ -99,7 +99,7 @@ sub show : Chained('load') PathPart('') {
     );
 }
 
-after [qw( show collections details tags aliases )] => sub {
+after [qw( show collections details tags ratings aliases )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };