Attachment 302676 Details for Bug 426386 – Patch to add javascript enabled check to Bugzilla code - logincookies (v1)

[patch] Patch to add javascript enabled check to Bugzilla code - logincookies (v1)

javascript_check.patch (text/plain), 11.12 KB, created by David Lawrence on 2008-04-16 21:21:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lawrence

Created: 2008-04-16 21:21:57 UTC

Size: 11.12 KB

patch

obsolete

>? bugzilla-3.2rh-20080416.1.tar.gz
>? bugzilla.spec
>? localconfig
>? patches
>? data/params
>Index: Bugzilla/Auth.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Auth.pm,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 Auth.pm
>--- Bugzilla/Auth.pm	19 Nov 2007 22:11:21 -0000	1.1.1.1
>+++ Bugzilla/Auth.pm	16 Apr 2008 20:39:19 -0000
>@@ -162,6 +162,10 @@
>         }
>         # Otherwise, we just return the "default" user.
>         $user = Bugzilla->user;
>+
>+        # REDHAT EXTENSION START 426386
>+        # Set javascript flag to enable UI enhancements
>+        $user->set_javascript($result->{javascript}) if exists $result->{javascript};
>     }
>     # The username/password may be wrong
>     # Don't let the user know whether the username exists or whether
>Index: Bugzilla/User.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/User.pm,v
>retrieving revision 1.7
>diff -u -r1.7 User.pm
>--- Bugzilla/User.pm	25 Mar 2008 21:06:14 -0000	1.7
>+++ Bugzilla/User.pm	16 Apr 2008 20:39:19 -0000
>@@ -73,6 +73,9 @@
>     'showmybugslink' => 0,
>     'disabledtext'   => '',
>     'disable_mail'   => 0,
>+    # REDHAT EXTENSION START 426386
>+    'javascript'     => 0,
>+    # REDHAT EXTENSION END 426386
> };
> 
> use constant DB_TABLE => 'profiles';
>@@ -95,12 +98,14 @@
> 
> use constant REQUIRED_CREATE_FIELDS => qw(login_name cryptpassword);
> 
>+# REDHAT EXTENSION 426386 Add javascript validator
> use constant VALIDATORS => {
>     cryptpassword => \&_check_password,
>     disable_mail  => \&_check_disable_mail,
>     disabledtext  => \&_check_disabledtext,
>     login_name    => \&check_login_name_for_creation,
>     realname      => \&_check_realname,
>+    javascript    => \&_check_javascript,
> };
> 
> sub UPDATE_COLUMNS {
>@@ -161,6 +166,10 @@
> sub _check_disable_mail { return $_[1] ? 1 : 0; }
> sub _check_disabledtext { return trim($_[1]) || ''; }
> 
>+# REDHAT EXTENSION START 426386
>+sub _check_javascript { return $_[1] ? 1 : 0; }
>+# REDHAT EXTENSION END 426386
>+
> # This is public since createaccount.cgi needs to use it before issuing
> # a token for account creation.
> sub check_login_name_for_creation {
>@@ -216,6 +225,9 @@
> 
> sub set_password { $_[0]->set('cryptpassword', $_[1]); }
> 
>+# REDHAT EXTENSION START 426386
>+sub set_javascript { $_[0]->set('javascript', $_[1]) }
>+# REDHAT EXTENSION END 426386
> 
> ################################################################################
> # Methods
>@@ -231,6 +243,10 @@
> sub email_disabled { $_[0]->{disable_mail}; }
> sub email_enabled { !($_[0]->{disable_mail}); }
> 
>+# REDHAT EXTENSION START 426386
>+sub javascript { $_[0]->{javascript}; }
>+# REDHAT EXTENSION END 426386
>+
> sub set_authorizer {
>     my ($self, $authorizer) = @_;
>     $self->{authorizer} = $authorizer;
>Index: Bugzilla/Auth/Verify.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Auth/Verify.pm,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 Verify.pm
>--- Bugzilla/Auth/Verify.pm	19 Nov 2007 22:11:21 -0000	1.1.1.1
>+++ Bugzilla/Auth/Verify.pm	16 Apr 2008 20:39:19 -0000
>@@ -124,6 +124,11 @@
>         trick_taint($real_name);
>         $user->set_name($real_name);
>     }
>+    # REDHAT EXTENSION START 426386
>+    if (exists $params->{javascript} && $user->javascript ne $params->{javascript}) {
>+        $user->set_javascript($params->{javascript});
>+    }
>+    # REDHAT EXTENSION END 426386
>     $user->update();
> 
>     return { user => $user };
>Index: Bugzilla/Auth/Login/Cookie.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Auth/Login/Cookie.pm,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 Cookie.pm
>--- Bugzilla/Auth/Login/Cookie.pm	19 Nov 2007 22:11:21 -0000	1.1.1.1
>+++ Bugzilla/Auth/Login/Cookie.pm	16 Apr 2008 20:39:19 -0000
>@@ -53,6 +53,17 @@
>         $user_id = $cookie->value if $cookie;
>     }
> 
>+    # REDHAT EXTENSION START 426386
>+    # Check for javascript cookie to enable some UI enhancements
>+    my $javascript = $cgi->cookie("Bugzilla_javascript");
>+    unless ($javascript) {
>+        my $cookie = first {$_->name eq 'Bugzilla_javascript'}
>+                                @{$cgi->{'Bugzilla_cookie_list'}};
>+        $javascript = $cookie->value if $cookie;
>+    }
>+    $javascript = $javascript ? 1 : 0;
>+    # REDHAT EXTENSION END 426386
>+
>     if ($login_cookie && $user_id) {
>         # Anything goes for these params - they're just strings which
>         # we're going to verify against the db
>@@ -78,19 +89,32 @@
> 
>         # If the cookie is valid, return a valid username.
>         if ($dbh->selectrow_array($query, undef, @params)) {
>+            # REDHAT EXTENSION START 426386
>             # If we logged in successfully, then update the lastused 
>             # time on the login cookie
>-            $dbh->do("UPDATE logincookies SET lastused = NOW() 
>-                       WHERE cookie = ?", undef, $login_cookie);
>-            return { user_id => $user_id };
>+            # Also update the javascript value
>+            $dbh->do("UPDATE logincookies SET lastused = NOW(),
>+                             javascript = ?
>+                       WHERE cookie = ?", undef, $javascript, $login_cookie);
>+
>+            # Remove this cookie for the next javascript check
>+            $cgi->remove_cookie('Bugzilla_javascript');
>+            # REDHAT EXTENSION END 426386
>+            
>+            return { user_id => $user_id, javascript => $javascript };
>         }
>     }
> 
>+    # REDHAT EXTENSION START 426386
>+    # Remove this cookie for the next javascript check
>+    $cgi->remove_cookie('Bugzilla_javascript');
>+    # REDHAT EXTENSION END 426386
>+
>     # Either the he cookie is invalid, or we got no cookie. We don't want 
>     # to ever return AUTH_LOGINFAILED, because we don't want Bugzilla to 
>     # actually throw an error when it gets a bad cookie. It should just 
>     # look like there was no cookie to begin with.
>-    return { failure => AUTH_NODATA };
>+    return { failure => AUTH_NODATA, javascript => $javascript };
> }
> 
> 1;
>Index: Bugzilla/DB/Schema.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/DB/Schema.pm,v
>retrieving revision 1.14
>diff -u -r1.14 Schema.pm
>--- Bugzilla/DB/Schema.pm	26 Mar 2008 18:53:00 -0000	1.14
>+++ Bugzilla/DB/Schema.pm	16 Apr 2008 20:39:19 -0000
>@@ -1000,7 +1000,10 @@
>                                         DELETE => 'CASCADE'}},
>             ipaddr   => {TYPE => 'varchar(40)'},
>             lastused => {TYPE => 'DATETIME', NOTNULL => 1},
>-            session  => {TYPE => 'VARCHAR(40)', NOTNULL => 1}
>+            session  => {TYPE => 'VARCHAR(40)', NOTNULL => 1},
>+            # REDHAT EXTENSION START 426386
>+            javascript => {TYPE => 'BOOLEAN', DEFAULT => 0 },
>+            # REDHAT EXTENSION END 426386
>         ],
>         INDEXES => [
>             logincookies_lastused_idx => ['lastused'],
>Index: Bugzilla/Install/DB.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Install/DB.pm,v
>retrieving revision 1.10
>diff -u -r1.10 DB.pm
>--- Bugzilla/Install/DB.pm	26 Mar 2008 18:53:00 -0000	1.10
>+++ Bugzilla/Install/DB.pm	16 Apr 2008 20:39:19 -0000
>@@ -524,6 +524,10 @@
> 
>     $dbh->bz_drop_index('longdescs', 'longdescs_thetext_idx');
>     _populate_bugs_fulltext();
>+
>+    # 2008-04-01 dkl@redhat.com - Bug 426382
>+    $dbh->bz_add_column('logincookies', 'javascript', 
>+                        { TYPE => 'BOOLEAN', DEFAULT => 0 });
>     
>     ################################################################
>     # New --TABLE-- changes should go *** A B O V E *** this point #
>Index: js/cookies.js
>===================================================================
>RCS file: js/cookies.js
>diff -N js/cookies.js
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ js/cookies.js	16 Apr 2008 20:39:19 -0000
>@@ -0,0 +1,47 @@
>+function getexpirydate(nodays)
>+{
>+    var UTCstring;
>+    Today = new Date();
>+    nomilli=Date.parse(Today);
>+    Today.setTime(nomilli+nodays*24*60*60*1000);
>+    UTCstring = Today.toUTCString();
>+    return UTCstring;
>+}
>+
>+function setcookie(name, value, expires, path, domain, secure)
>+{
>+    var curCookie = name + "=" + escape(value) +
>+        ((expires) ? "; expires=" + getexpirydate(expires) : "") +
>+        ((path) ? "; path=" + path : "") +
>+        ((domain) ? "; domain=" + domain : "") +
>+        ((secure) ? "; secure" : "");
>+    document.cookie = curCookie;
>+}
>+
>+function getcookie(name)
>+{
>+    var dc = document.cookie;
>+    var prefix = name + "=";
>+    var begin = dc.indexOf("; " + prefix);
>+    if (begin == -1) {
>+        begin = dc.indexOf(prefix);
>+        if (begin != 0) 
>+            return null;
>+    } else
>+        begin += 2;
>+    var end = document.cookie.indexOf(";", begin);
>+    if (end == -1)
>+        end = dc.length;
>+    return unescape(dc.substring(begin + prefix.length, end));
>+}
>+
>+function deletecookie(name, path, domain)
>+{
>+    if (getcookie(name)) {
>+        document.cookie = name + "=" +
>+            ((path) ? "; path=" + path : "") +
>+            ((domain) ? "; domain=" + domain : "") +
>+            "; expires=Thu, 01-Jan-70 00:00:01 GMT";
>+    }
>+}
>+
>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.23
>diff -u -r1.23 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	11 Apr 2008 04:41:41 -0000	1.23
>+++ template/en/default/bug/edit.html.tmpl	16 Apr 2008 20:39:19 -0000
>@@ -133,6 +133,9 @@
>           form.comment.className='';
>       }
>   }
>+    
>+  // REDHAT EXTENSION 426382 Add setcookie() to track javascript capability
>+  setcookie('Bugzilla_javascript',1,1,'[% Param('cookiepath') %]','[% Param('cookiedomain') %]',1);
> 
>   //-->
>   </script>
>Index: template/en/default/global/header.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/global/header.html.tmpl,v
>retrieving revision 1.5
>diff -u -r1.5 header.html.tmpl
>--- template/en/default/global/header.html.tmpl	21 Feb 2008 17:03:57 -0000	1.5
>+++ template/en/default/global/header.html.tmpl	16 Apr 2008 20:39:19 -0000
>@@ -75,6 +75,11 @@
>       </script>
>     [% END %]
> 
>+    [%# REDHAT EXTENSION START 426382
>+      # Add setcookie() to track javascript capability %]
>+    <script src="js/cookies.js" type="text/javascript" language="JavaScript"></script>
>+    [%# REDHAT EXTENSION END 426382 %]
>+
>     [% IF javascript_urls %]
>       [% FOREACH javascript_url = javascript_urls %]
>         <script src="[% javascript_url FILTER html %]" type="text/javascript"></script>
>@@ -227,7 +232,8 @@
>   # but set the onload attribute in the DEFAULT directive above.
>   #%]
> 
>-  <body onload="[% onload %]"
>+  [%# REDHAT EXTENSION 426382 Add setcookie() to track javascript capability %]
>+  <body onload="setcookie('Bugzilla_javascript',1,1,'[% Param('cookiepath') %]','[% Param('cookiedomain') %]',1); [% onload %]"
>         class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %]
>                [% FOREACH class = bodyclasses %]
>                  [% ' ' %][% class FILTER css_class_quote %]

Flags:

dkl: review? (kbaker)
dkl: review? (nelhawar)

Actions: View | Diff

Attachments on bug 426386: 299968 | 300139 | 302670 | 302676