Patch email handler

3 files changed, 18 insertions, 0 deletions

diff --git a/bugzilla/Dockerfile b/bugzilla/Dockerfile
index c1ac084..065c3f2 100644
--- a/bugzilla/Dockerfile
+++ b/bugzilla/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Michael Crute <mike@crute.us>
 ARG bz_version
 
 ADD binaries/ /tmp/
+ADD patches/ /tmp/
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     echo 'Acquire::http::Proxy "http://genesis.sea1.crute.me:3142";' > /etc/apt/apt.conf && \
@@ -15,6 +16,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install -y \
         cron \
         nginx \
+        patch \
         python-boto3 \
         runit \
         sudo \
@@ -123,6 +125,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 # Enable voting extension
     rm /var/www/html/bugzilla/extensions/Voting/disabled && \
 
+# Patch the code
+    # Update the email_in script to lookup by email instead of assuming that
+    # usernames are the same as email addresses.
+    cd / && patch -p1 < /tmp/email_in.pl.patch && \
+
 # Clean up
     rm /etc/apt/apt.conf && \
     apt-get clean && \
diff --git a/bugzilla/binaries/answers.pl b/bugzilla/patches/answers.pl
index 90b06af..90b06af 100644
--- a/bugzilla/binaries/answers.pl
+++ b/bugzilla/patches/answers.pl
diff --git a/bugzilla/patches/email_in.pl.patch b/bugzilla/patches/email_in.pl.patch
new file mode 100644
index 0000000..e2e5ba0
--- /dev/null
+++ b/bugzilla/patches/email_in.pl.patch
@@ -0,0 +1,11 @@
+--- a/var/www/html/bugzilla-release-5.1.1//email_in.pl  2016-05-16 18:48:27.000000000 +0000
++++ b/var/www/html/bugzilla-release-5.1.1//email_in.pl  2017-05-17 03:53:38.978805718 +0000
+@@ -509,7 +509,7 @@
+ 
+ my $username = $mail_fields->{'reporter'};
+ 
+-my $user = Bugzilla::User->check($username);
++my $user = new Bugzilla::User(Bugzilla::User::email_to_id($username, 1));
+ Bugzilla->set_user($user);
+ 
+ my ($bug, $comment);