1 files changed, 28 insertions, 5 deletions

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 2d5d2b182..f23ab723f 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -46,6 +46,7 @@ use Bugzilla::User;
 use Bugzilla::UserAgent qw(detect_platform detect_op_sys);
 use Bugzilla::User::Setting;
 use Bugzilla::Util;
+use Bugzilla::PSGI qw(compile_cgi);
 
 use Date::Parse;
 use DateTime;
@@ -878,7 +879,7 @@ sub object_end_of_create {
         # Add default searches to new user's footer
         my $dbh = Bugzilla->dbh;
 
-        my $sharer = Bugzilla::User->new({ name => 'nobody@mozilla.org' })
+        my $sharer = Bugzilla::User->new({ name => Bugzilla->params->{'nobody_user'} })
             or return;
         my $group = Bugzilla::Group->new({ name => 'everyone' })
             or return;
@@ -919,7 +920,7 @@ sub _bug_reporters_hw_os {
 sub _bug_is_unassigned {
     my ($self) = @_;
     my $assignee = $self->assigned_to->login;
-    return $assignee eq 'nobody@mozilla.org' || $assignee =~ /\.bugs$/;
+    return $assignee eq Bugzilla->params->{'nobody_user'} || $assignee =~ /\.bugs$/;
 }
 
 sub _bug_has_current_patch {
@@ -1100,7 +1101,7 @@ sub object_start_of_update {
 
     # and the assignee isn't a real person
     return unless
-        $new_bug->assigned_to->login eq 'nobody@mozilla.org'
+        $new_bug->assigned_to->login eq Bugzilla->params->{'nobody_user'}
         || $new_bug->assigned_to->login =~ /\.bugs$/;
 
     # and the user can set the status to NEW
@@ -1595,7 +1596,7 @@ sub field_end_of_create {
     my $name = $field->name;
 
     if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        Bugzilla->set_user(Bugzilla::User->check({ name => 'nobody@mozilla.org' }));
+        Bugzilla->set_user(Bugzilla::User->check({ name => Bugzilla->params->{'nobody_user'} }));
         print "Creating IT permission grant bug for new field '$name'...";
     }
 
@@ -1666,6 +1667,28 @@ sub webservice {
     $dispatch->{BMO} = "Bugzilla::Extension::BMO::WebService";
 }
 
+sub psgi_builder {
+    my ($self, $args) = @_;
+    my $mount = $args->{mount};
+
+    my $ses_index = Plack::Builder::builder(sub {
+        my $auth_user = Bugzilla->localconfig->{ses_username};
+        my $auth_pass = Bugzilla->localconfig->{ses_password};
+        Plack::Builder::enable("Auth::Basic", authenticator => sub {
+            my ($username, $password, $env) = @_;
+            return (   $auth_user
+                    && $auth_pass
+                    && $username
+                    && $password
+                    && $username eq $auth_user
+                    && $password eq $auth_pass );
+        });
+        compile_cgi("ses/index.cgi");
+    });
+
+    $mount->{'ses/index.cgi'} = $ses_index;
+}
+
 our $search_content_matches;
 BEGIN {
     $search_content_matches = \&Bugzilla::Search::_content_matches;
@@ -1951,7 +1974,7 @@ sub _post_employee_incident_bug {
     my ($investigate_bug, $ssh_key_bug);
     my $old_user = Bugzilla->user;
     eval {
-        Bugzilla->set_user(Bugzilla::User->new({ name => 'nobody@mozilla.org' }));
+        Bugzilla->set_user(Bugzilla::User->new({ name => Bugzilla->params->{'nobody_user'} }));
         my $new_user = Bugzilla->user;
 
         # HACK: User needs to be in the editbugs and primary bug's group to allow