fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-11-10 10:01 am
  • Add Memory
  • Share This Entry

[dw-free] remove Section 9 from package LJ in User.pm

[commit: http://hg.dwscoalition.org/dw-free/rev/abcdbb56342b]

http://bugs.dwscoalition.org/show_bug.cgi?id=3200

Cleanup: $u->rate_log, rather than LJ::rate_log (same for infohistory_add,
rate_check). Removes an entire section from the LJ package in LJ/User.pm
(moved to LJ::User)

Patch by [personal profile] kareila.

Files modified:
  • cgi-bin/DW/User/Rename.pm
  • cgi-bin/LJ/Console/Command/ChangeJournalType.pm
  • cgi-bin/LJ/Console/Command/ResetPassword.pm
  • cgi-bin/LJ/User.pm
  • cgi-bin/ljprotocol.pl
  • htdocs/changeemail.bml
  • htdocs/changepassword.bml
  • htdocs/lostinfo.bml
  • htdocs/manage/circle/invite.bml
  • t/console-infohistory.t
--------------------------------------------------------------------------------
diff -r cf5e3742f568 -r abcdbb56342b cgi-bin/DW/User/Rename.pm
--- a/cgi-bin/DW/User/Rename.pm	Wed Nov 10 17:26:39 2010 +0800
+++ b/cgi-bin/DW/User/Rename.pm	Wed Nov 10 18:01:41 2010 +0800
@@ -378,7 +378,7 @@ sub _rename {
     $self->update_email_alias;
 
     # infohistory
-    LJ::infohistory_add( $self, "username", $fromusername );
+    $self->infohistory_add( "username", $fromusername );
 
     # notification
     LJ::Event::SecurityAttributeChanged->new( $self, { 
diff -r cf5e3742f568 -r abcdbb56342b cgi-bin/LJ/Console/Command/ChangeJournalType.pm
--- a/cgi-bin/LJ/Console/Command/ChangeJournalType.pm	Wed Nov 10 17:26:39 2010 +0800
+++ b/cgi-bin/LJ/Console/Command/ChangeJournalType.pm	Wed Nov 10 18:01:41 2010 +0800
@@ -137,7 +137,7 @@ sub execute {
     # update the password
     $extra->{password} = $type eq "community" ? '' : $ou->password;
 
-    LJ::infohistory_add($u, 'password', Digest::MD5::md5_hex($u->password . 'change'))
+    $u->infohistory_add( 'password', Digest::MD5::md5_hex( $u->password . 'change' ) )
         if $extra->{password} ne $u->password;
 
     # reset the email address
diff -r cf5e3742f568 -r abcdbb56342b cgi-bin/LJ/Console/Command/ResetPassword.pm
--- a/cgi-bin/LJ/Console/Command/ResetPassword.pm	Wed Nov 10 17:26:39 2010 +0800
+++ b/cgi-bin/LJ/Console/Command/ResetPassword.pm	Wed Nov 10 18:01:41 2010 +0800
@@ -45,7 +45,7 @@ sub execute {
 
     my $newpass = LJ::rand_chars(8);
     my $oldpass = Digest::MD5::md5_hex($u->password . "change");
-    my $rval = LJ::infohistory_add($u, 'passwordreset', $oldpass);
+    my $rval = $u->infohistory_add( 'passwordreset', $oldpass );
     return $self->error("Failed to insert old password into infohistory.")
         unless $rval;
 
diff -r cf5e3742f568 -r abcdbb56342b cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Wed Nov 10 17:26:39 2010 +0800
+++ b/cgi-bin/LJ/User.pm	Wed Nov 10 18:01:41 2010 +0800
@@ -1226,11 +1226,6 @@ sub note_activity {
 }
 
 
-sub rate_check { LJ::rate_check( @_ ); }
-
-sub rate_log { LJ::rate_log( @_ ); }
-
-
 sub record_login {
     my ($u, $sessid) = @_;
 
@@ -3406,6 +3401,30 @@ sub dudata_set {
 }
 
 
+# <LJFUNC>
+# name: LJ::User::infohistory_add
+# des: Add a line of text to the [[dbtable[infohistory]] table for an account.
+# args: uuid, what, value, other?
+# des-uuid: User id or user object to insert infohistory for.
+# des-what: What type of history is being inserted (15 chars max).
+# des-value: Value for the item (255 chars max).
+# des-other: Optional. Extra information / notes (30 chars max).
+# returns: 1 on success, 0 on error.
+# </LJFUNC>
+sub infohistory_add {
+    my ( $u, $what, $value, $other ) = @_;
+    my $uuid = LJ::want_userid( $u );
+    return unless $uuid && $what && $value;
+
+    # get writer and insert
+    my $dbh = LJ::get_db_writer();
+    my $gmt_now = LJ::mysql_time(time(), 1);
+    $dbh->do("INSERT INTO infohistory (userid, what, timechange, oldvalue, other) VALUES (?, ?, ?, ?, ?)",
+             undef, $uuid, $what, $gmt_now, $value, $other);
+    return $dbh->err ? 0 : 1;
+}
+
+
 # log a line to our userlog
 sub log_event {
     my ( $u, $type, $info ) = @_;
@@ -3430,6 +3449,118 @@ sub log_event {
            "VALUES (?, UNIX_TIMESTAMP(), ?, ?, ?, ?, ?, ?)", undef, $u->userid, $type,
            $targetid, $remote ? $remote->userid : undef, $ip, $uniq, $extra);
     return undef if $u->err;
+    return 1;
+}
+
+
+# returns 1 if action is permitted.  0 if above rate or fail.
+sub rate_check {
+    my ($u, $ratename, $count, $opts) = @_;
+
+    my $rateperiod = $u->get_cap( "rateperiod-$ratename" );
+    return 1 unless $rateperiod;
+
+    my $rp = defined $opts->{'rp'} ? $opts->{'rp'}
+             : LJ::get_prop("rate", $ratename);
+    return 0 unless $rp;
+
+    my $now = defined $opts->{'now'} ? $opts->{'now'} : time();
+    my $beforeperiod = $now - $rateperiod;
+
+    # check rate.  (okay per period)
+    my $opp = $u->get_cap( "rateallowed-$ratename" );
+    return 1 unless $opp;
+
+    # check memcache, except in the case of rate limiting by ip
+    my $memkey = $u->rate_memkey($rp);
+    unless ($opts->{limit_by_ip}) {
+        my $attempts = LJ::MemCache::get($memkey);
+        if ($attempts) {
+            my $num_attempts = 0;
+            foreach my $attempt (@$attempts) {
+                next if $attempt->{evttime} < $beforeperiod;
+                $num_attempts += $attempt->{quantity};
+            }
+
+            return $num_attempts + $count > $opp ? 0 : 1;
+        }
+    }
+
+    return 0 unless $u->writer;
+
+    # delete inapplicable stuff (or some of it)
+    my $userid = $u->userid;
+    $u->do("DELETE FROM ratelog WHERE userid=$userid AND rlid=$rp->{'id'} ".
+           "AND evttime < $beforeperiod LIMIT 1000");
+
+    my $udbr = LJ::get_cluster_reader($u);
+    my $ip = defined $opts->{'ip'}
+             ? $opts->{'ip'}
+             : $udbr->quote($opts->{'limit_by_ip'} || "0.0.0.0");
+    my $sth = $udbr->prepare("SELECT evttime, quantity FROM ratelog WHERE ".
+                             "userid=$userid AND rlid=$rp->{'id'} ".
+                             "AND ip=INET_ATON($ip) ".
+                             "AND evttime > $beforeperiod");
+    $sth->execute;
+
+    my @memdata;
+    my $sum = 0;
+    while (my $data = $sth->fetchrow_hashref) {
+        push @memdata, $data;
+        $sum += $data->{quantity};
+    }
+
+    # set memcache, except in the case of rate limiting by ip
+    unless ($opts->{limit_by_ip}) {
+        LJ::MemCache::set( $memkey => \@memdata || [] );
+    }
+
+    # would this transaction go over the limit?
+    if ($sum + $count > $opp) {
+        # FIXME: optionally log to rateabuse, unless caller is doing it
+        # themselves somehow, like with the "loginstall" table.
+        return 0;
+    }
+
+    return 1;
+}
+
+
+# returns 1 if action is permitted.  0 if above rate or fail.
+# action isn't logged on fail.
+#
+# opts keys:
+#   -- "limit_by_ip" => "1.2.3.4"  (when used for checking rate)
+#   --
+sub rate_log {
+    my ($u, $ratename, $count, $opts) = @_;
+    my $rateperiod = $u->get_cap( "rateperiod-$ratename" );
+    return 1 unless $rateperiod;
+
+    return 0 unless $u->writer;
+
+    my $rp = LJ::get_prop("rate", $ratename);
+    return 0 unless $rp;
+    $opts->{'rp'} = $rp;
+
+    my $now = time();
+    $opts->{'now'} = $now;
+    my $udbr = LJ::get_cluster_reader($u);
+    my $ip = $udbr->quote($opts->{'limit_by_ip'} || "0.0.0.0");
+    $opts->{'ip'} = $ip;
+    return 0 unless $u->rate_check( $ratename, $count, $opts );
+
+    # log current
+    $count = $count + 0;
+    my $userid = $u->userid;
+    $u->do("INSERT INTO ratelog (userid, rlid, evttime, ip, quantity) VALUES ".
+           "($userid, $rp->{'id'}, $now, INET_ATON($ip), $count)");
+
+    # delete memcache, except in the case of rate limiting by ip
+    unless ($opts->{limit_by_ip}) {
+        LJ::MemCache::delete($u->rate_memkey($rp));
+    }
+
     return 1;
 }
 
@@ -4436,7 +4567,7 @@ sub reset_email {
               " WHERE userid=? AND what='email'", undef, $u->id ) or
         return $errsub->( LJ::Lang::ml( "error.dberror" ) . $dbh->errstr );
 
-    LJ::infohistory_add( $u, 'emailreset', $u->email_raw, $u->email_status )
+    $u->infohistory_add( 'emailreset', $u->email_raw, $u->email_status )
         if $u->email_raw ne $newemail; # record only if it changed
 
     $update_opts ||= { status => 'T' };
@@ -5355,7 +5486,7 @@ sub rename_identity {
 
     LJ::memcache_kill($u, "userid");
 
-    LJ::infohistory_add($u, 'identity', $from);
+    $u->infohistory_add( 'identity', $from );
 
     return 1;
 }
@@ -7042,7 +7173,6 @@ use Carp;
 ###  5. Database and Memcache Functions
 ###  6. What the App Shows to Users
 ###  8. Formatting Content Shown to Users
-###  9. Logging and Recording Actions
 ###  15. Email-Related Functions
 ###  16. Entry-Related Functions
 ###  17. Interest-Related Functions
@@ -7673,7 +7803,7 @@ sub handle_bad_login
     # an IP address is permitted such a rate of failures
     # until it's banned for a period of time.
     my $udbh;
-    if (! LJ::rate_log($u, "failed_login", 1, { 'limit_by_ip' => $ip }) &&
+    if (! $u->rate_log( "failed_login", 1, { limit_by_ip => $ip } ) &&
         ($udbh = LJ::get_cluster_master($u)))
     {
         $udbh->do("REPLACE INTO loginstall (userid, ip, time) VALUES ".
@@ -8430,149 +8560,6 @@ sub user_search_display {
 
 
 ########################################################################
-###  9. Logging and Recording Actions
-
-=head2 Logging and Recording Actions (LJ)
-=cut
-
-# <LJFUNC>
-# name: LJ::infohistory_add
-# des: Add a line of text to the [[dbtable[infohistory]] table for an account.
-# args: uuid, what, value, other?
-# des-uuid: User id or user object to insert infohistory for.
-# des-what: What type of history is being inserted (15 chars max).
-# des-value: Value for the item (255 chars max).
-# des-other: Optional. Extra information / notes (30 chars max).
-# returns: 1 on success, 0 on error.
-# </LJFUNC>
-sub infohistory_add {
-    my ($uuid, $what, $value, $other) = @_;
-    $uuid = LJ::want_userid($uuid);
-    return unless $uuid && $what && $value;
-
-    # get writer and insert
-    my $dbh = LJ::get_db_writer();
-    my $gmt_now = LJ::mysql_time(time(), 1);
-    $dbh->do("INSERT INTO infohistory (userid, what, timechange, oldvalue, other) VALUES (?, ?, ?, ?, ?)",
-             undef, $uuid, $what, $gmt_now, $value, $other);
-    return $dbh->err ? 0 : 1;
-}
-
-
-# returns 1 if action is permitted.  0 if above rate or fail.
-sub rate_check {
-    my ($u, $ratename, $count, $opts) = @_;
-
-    my $rateperiod = LJ::get_cap($u, "rateperiod-$ratename");
-    return 1 unless $rateperiod;
-
-    my $rp = defined $opts->{'rp'} ? $opts->{'rp'}
-             : LJ::get_prop("rate", $ratename);
-    return 0 unless $rp;
-
-    my $now = defined $opts->{'now'} ? $opts->{'now'} : time();
-    my $beforeperiod = $now - $rateperiod;
-
-    # check rate.  (okay per period)
-    my $opp = LJ::get_cap($u, "rateallowed-$ratename");
-    return 1 unless $opp;
-
-    # check memcache, except in the case of rate limiting by ip
-    my $memkey = $u->rate_memkey($rp);
-    unless ($opts->{limit_by_ip}) {
-        my $attempts = LJ::MemCache::get($memkey);
-        if ($attempts) {
-            my $num_attempts = 0;
-            foreach my $attempt (@$attempts) {
-                next if $attempt->{evttime} < $beforeperiod;
-                $num_attempts += $attempt->{quantity};
-            }
-
-            return $num_attempts + $count > $opp ? 0 : 1;
-        }
-    }
-
-    return 0 unless $u->writer;
-
-    # delete inapplicable stuff (or some of it)
-    my $userid = $u->userid;
-    $u->do("DELETE FROM ratelog WHERE userid=$userid AND rlid=$rp->{'id'} ".
-           "AND evttime < $beforeperiod LIMIT 1000");
-
-    my $udbr = LJ::get_cluster_reader($u);
-    my $ip = defined $opts->{'ip'}
-             ? $opts->{'ip'}
-             : $udbr->quote($opts->{'limit_by_ip'} || "0.0.0.0");
-    my $sth = $udbr->prepare("SELECT evttime, quantity FROM ratelog WHERE ".
-                             "userid=$userid AND rlid=$rp->{'id'} ".
-                             "AND ip=INET_ATON($ip) ".
-                             "AND evttime > $beforeperiod");
-    $sth->execute;
-
-    my @memdata;
-    my $sum = 0;
-    while (my $data = $sth->fetchrow_hashref) {
-        push @memdata, $data;
-        $sum += $data->{quantity};
-    }
-
-    # set memcache, except in the case of rate limiting by ip
-    unless ($opts->{limit_by_ip}) {
-        LJ::MemCache::set( $memkey => \@memdata || [] );
-    }
-
-    # would this transaction go over the limit?
-    if ($sum + $count > $opp) {
-        # FIXME: optionally log to rateabuse, unless caller is doing it
-        # themselves somehow, like with the "loginstall" table.
-        return 0;
-    }
-
-    return 1;
-}
-
-
-# returns 1 if action is permitted.  0 if above rate or fail.
-# action isn't logged on fail.
-#
-# opts keys:
-#   -- "limit_by_ip" => "1.2.3.4"  (when used for checking rate)
-#   --
-sub rate_log
-{
-    my ($u, $ratename, $count, $opts) = @_;
-    my $rateperiod = LJ::get_cap($u, "rateperiod-$ratename");
-    return 1 unless $rateperiod;
-
-    return 0 unless $u->writer;
-
-    my $rp = LJ::get_prop("rate", $ratename);
-    return 0 unless $rp;
-    $opts->{'rp'} = $rp;
-
-    my $now = time();
-    $opts->{'now'} = $now;
-    my $udbr = LJ::get_cluster_reader($u);
-    my $ip = $udbr->quote($opts->{'limit_by_ip'} || "0.0.0.0");
-    $opts->{'ip'} = $ip;
-    return 0 unless LJ::rate_check($u, $ratename, $count, $opts);
-
-    # log current
-    $count = $count + 0;
-    my $userid = $u->userid;
-    $u->do("INSERT INTO ratelog (userid, rlid, evttime, ip, quantity) VALUES ".
-           "($userid, $rp->{'id'}, $now, INET_ATON($ip), $count)");
-
-    # delete memcache, except in the case of rate limiting by ip
-    unless ($opts->{limit_by_ip}) {
-        LJ::MemCache::delete($u->rate_memkey($rp));
-    }
-
-    return 1;
-}
-
-
-########################################################################
 ###  15. Email-Related Functions
 
 =head2 Email-Related Functions (LJ)
diff -r cf5e3742f568 -r abcdbb56342b cgi-bin/ljprotocol.pl
--- a/cgi-bin/ljprotocol.pl	Wed Nov 10 17:26:39 2010 +0800
+++ b/cgi-bin/ljprotocol.pl	Wed Nov 10 18:01:41 2010 +0800
@@ -1497,7 +1497,7 @@ sub postevent
     $getlock->(); return $res if $res_done;
 
     # do rate-checking
-    if ( ! $u->is_syndicated && ! LJ::rate_log($u, "post", 1) && ! $importer_bypass ) {
+    if ( ! $u->is_syndicated && ! $u->rate_log( "post", 1 ) && ! $importer_bypass ) {
         return $fail->($err,405);
     }
 
diff -r cf5e3742f568 -r abcdbb56342b htdocs/changeemail.bml
--- a/htdocs/changeemail.bml	Wed Nov 10 17:26:39 2010 +0800
+++ b/htdocs/changeemail.bml	Wed Nov 10 18:01:41 2010 +0800
@@ -140,7 +140,7 @@ body<=
 
         LJ::statushistory_add( $u, $remote, 'email_changed', $loginfo );
 
-        LJ::infohistory_add($u, 'email', $old_email, $u->{status});
+        $u->infohistory_add( 'email', $old_email, $u->{status} );
 
         $u->log_event('email_change', { remote => $remote, new => $POST{'email'} });
 
diff -r cf5e3742f568 -r abcdbb56342b htdocs/changepassword.bml
--- a/htdocs/changepassword.bml	Wed Nov 10 17:26:39 2010 +0800
+++ b/htdocs/changepassword.bml	Wed Nov 10 18:01:41 2010 +0800
@@ -173,7 +173,7 @@ body<=
      ## make note of changed password
      my $dbh = LJ::get_db_writer();
      my $oldval = Digest::MD5::md5_hex($u->password . "change");
-     LJ::infohistory_add($u, 'password', $oldval);
+     $u->infohistory_add( 'password', $oldval );
 
      $u->log_event('password_change', { remote => $remote });
 
diff -r cf5e3742f568 -r abcdbb56342b htdocs/lostinfo.bml
--- a/htdocs/lostinfo.bml	Wed Nov 10 17:26:39 2010 +0800
+++ b/htdocs/lostinfo.bml	Wed Nov 10 18:01:41 2010 +0800
@@ -125,7 +125,7 @@ body<=
             return $err->( $ML{'.error.renamed'} );
         }
 
-        return LJ::bad_input($ML{'.error.toofrequent'}) unless LJ::rate_log($u, "lostinfo", 1);
+        return LJ::bad_input($ML{'.error.toofrequent'}) unless $u->rate_log( "lostinfo", 1 );
 
         # Check to see if they are banned from sending a password
         if (LJ::sysban_check('lostpassword', $u->{'user'})) {
@@ -201,7 +201,7 @@ body<=
 
             # As the idea is to limit spam to one e-mail address, if any of their username's are
             # over the limit, then don't send them any more e-mail.
-            return LJ::bad_input($ML{'.error.toofrequent'}) unless LJ::rate_log($u, "lostinfo", 1);
+            return LJ::bad_input($ML{'.error.toofrequent'}) unless $u->rate_log( "lostinfo", 1 );
             push @users, $u->{user};
         }
 
diff -r cf5e3742f568 -r abcdbb56342b htdocs/manage/circle/invite.bml
--- a/htdocs/manage/circle/invite.bml	Wed Nov 10 17:26:39 2010 +0800
+++ b/htdocs/manage/circle/invite.bml	Wed Nov 10 18:01:41 2010 +0800
@@ -159,7 +159,7 @@ _c?>
     my $code_sent;
     if (LJ::did_post() && $validate_form->()) {
 
-        if (LJ::rate_log($u, 'invitefriend', 1)) {
+        if ( $u->rate_log( 'invitefriend', 1 ) ) {
 
             my $given_msg_custom = $POST{msg} ? "$POST{msg}\n\n" : "";
             LJ::send_mail({
diff -r cf5e3742f568 -r abcdbb56342b t/console-infohistory.t
--- a/t/console-infohistory.t	Wed Nov 10 17:26:39 2010 +0800
+++ b/t/console-infohistory.t	Wed Nov 10 18:01:41 2010 +0800
@@ -26,7 +26,7 @@ is($run->("infohistory " . $u2->user),
    "error: No matches.");
 
 # put something in there.
-LJ::infohistory_add($u2, 'email', $u2->email_raw, 'T');
+$u2->infohistory_add( 'email', $u2->email_raw, 'T' );
 
 my $response = $run->("infohistory " . $u2->user);
 like($response, qr/Changed email at \d{4}-\d{2}-\d{2}/, "Date recorded correctly.");
--------------------------------------------------------------------------------
  • Add Memory
  • Share This Entry
(0 comments)

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.