Changeset 1355

Timestamp:

03/02/07 07:45:00 (2 years ago)

Author:

jm3

Message:

preliminary bot

Files:

• feedmelinks/.htaccess-global (modified) (1 diff)
• feedmelinks/_config/groups (modified) (2 diffs)
• feedmelinks/aim/bot/klaus.pl (modified) (1 diff)
• feedmelinks/aim/restricted (added)
• feedmelinks/aim/restricted/secure-call.php (added)
• feedmelinks/api/add.php (modified) (3 diffs)
• feedmelinks/export/index.php (modified) (1 diff)
• feedmelinks/lib/FeedMeLinks/Bot.pm (modified) (4 diffs)
• feedmelinks/modules/main-interface.inc.php (modified) (1 diff)
• feedmelinks/modules/utils.inc.php (modified) (1 diff)
• feedmelinks/set-up/IM.php (modified) (3 diffs)
• feedmelinks/style/validation.css (modified) (2 diffs)
• feedmelinks/validate/IM.php (modified) (1 diff)

feedmelinks/.htaccess-global

@@ -51 +51 @@
-RewriteRule    ^xml/set/comment   /api/comment
-RewriteRule    ^xml/peeps$ /peeps-as-xml [L]
-backroom
+restricted
-
-# JSON API

feedmelinks/_config/groups

@@ -39 +39 @@
-cover
-covey
-cowardice
-crash
-cruft
@@ -210 +209 @@
-cover
-covey
-cowardice
-crash
-cruft

feedmelinks/aim/bot/klaus.pl

@@ -33 +33 @@
-        # has to happen at the main klaus level so we can force a reload of all the other commands in the module
-        if( $message =~ m/reload/ ) {
-
+|| $sender eq "jm3bottester" 
-                        Module::Reload->check;
-                        $sessions_ref = {};
-                        $aim->send_im($sender, "reloaded " . FeedMeLinks::Bot::get_version());
-                } else {
-jm3theDestroy
+a super-us
-                }
-        } else {

feedmelinks/api/add.php

@@ -8 +8 @@
-        $tok =  $authenticated = $_COOKIE["c_pass_token"];
-
+                header( "Content-type: text/xml");
-        if( $u && ($pass && $pass == getPasswdForUser( $u ) || ($tok && $tok == md5( getPasswdForUser( $u ))))) {
-                header( "Content-type: text/xml");
-
-                # support the del.icio.us api naming as well for name(description) and private(shared):
@@ -27 +27 @@
-                }
-
-info='New link added as 
+new_link='
-
-                if( $tags ) {
@@ -56 +56 @@
-                header('WWW-Authenticate: Basic realm="Feed_Me_Links_XML_API"');
-                header('HTTP/1.0 401 Unauthorized');
-login first, please.
+<result code='Log in first, please.'/>
-        }
-?>

feedmelinks/export/index.php

@@ -34 +34 @@
-                <option value="html">HTML</option>
-                <option value="json">JSON</option>
-                <option value="rss">RSS - coming soon</option>
-        </select>
-        <select name="select">

feedmelinks/lib/FeedMeLinks/Bot.pm

@@ -1 +1 @@
-#!/usr/local/bin/perl
-package FeedMeLinks::Bot;
-
+
+
+
+
+
+
+
+
+
-use MIME::Base64;
-use LWP;
-use XML::XPath;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-sub h {
@@ -24 +23 @@
-        my ($aim, $sender, $message, $away, $sessions_ref ) = @_;
-        my $user;
+
+        my $result = is_user_validated( $sender );
+        my $fml_username = $result ? $result : "";
+
+        # FIXME: bust this out into an init method so we can call it equally when loading or when validating
+        # FIXME: and add the proxy. then we are rockin
-        $sessions_ref->{ "$sender" } = { 
-                "last_link"    => "none yet",
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # handle commands
-
-        if( $message =~ m/(ftp|gopher|https?):\/\// || $message =~ m/www\./ ) {
-                if( $sessions_ref->{ $sender }->{ "validated" } ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
+
+
-                }
-
-                
+        } elsif( $message =~ m/validate:/ ) {
+
+                        my $claimed_fml_username = $message;
+                        $claimed_fml_username =~ s/validate: //;
+                        my $aim_validation_phrase = $claimed_fml_username; # ordering of these lines is significant!
+                        $aim_validation_phrase =~ s/^.+, //;
+                        $aim_validation_phrase =~ s/<.*$//;
+                        $claimed_fml_username =~ s/,.+$//;
+                        print "claimed_fml_username: $claimed_fml_username\n";
+                        print "aim_validation_phrase: $aim_validation_phrase\n";
+
+                        print "http://www.feedmelinks.com/api/backroom/get_im_validation_phrase_for_user&user=$claimed_fml_username\n";
+                my $response = $www->get( 
+                        "http://www.feedmelinks.com/api/backroom/get_im_validation_phrase_for_user&user=$claimed_fml_username",
+                        []);
+                my $xp = XML::XPath->new(xml => $response->content);
+                my $fml_validation_phrase = $xp->getNodeText("/rest/response");
+                print "fml_validation_phrase: $fml_validation_phrase\n";
+
+                if( $fml_validation_phrase eq $aim_validation_phrase ) {
+                        my $response = $www->get( 
+                                "http://www.feedmelinks.com/api/backroom/validate_users_im_name&user=$claimed_fml_username",
+                                []);
+                        $xp = XML::XPath->new(xml => $response->content);
+                        my $validation_response = $xp->getNodeText("/rest/response");
+                        print "validation_response: $validation_response\n";
+
+                        # update the sessions table
+                        $sessions_ref->{ "$sender" }->{ "validated" } = 1;
+                        $sessions_ref->{ "$sender" }->{ "fml_username" } = $claimed_fml_username;
+
+                        my $response = $www->get( "http://feedmelinks.com/api/backroom/getPasswdForUser&user=$claimed_fml_username", []);
+                        $xp = XML::XPath->new(xml => $response->content);
+                        my $fml_password = $xp->getNodeText("/rest/response");
+                        print "fml_password: $fml_password\n";
+                        $sessions_ref->{ "$sender" }->{ "proxy" } = get_proxy( $claimed_fml_username, $fml_password );
+
+                        $aim->send_im($sender, "<b>All done -- that was easy</b>!\nNow your Feed Me Links account is linked to your AIM and you can start using Feed Me Links via AIM. To get started, paste any URL into this window." );
+                } else {
+                        $aim->send_im($sender, h("Darn, that doesn't match our records. Please try again, or <a href='http://feedmelinks.com/contact-us?subject=AIM+issues:+'>contact us</a>.") );
+                }
+
-        } elsif( $message =~ m/who/ || $message =~ m/lusers/ ) {
-                my $users = "";
-    for my $user ( keys %$sessions_ref ) {
+                        print "who: $user\n";
-                        $users .= 
-                        "<a href='http://feedmelinks.com/u/" 
@@ -59 +134 @@
-                $aim->send_im($sender, get_version());
-        
+        } elsif( $message =~ m/(links|recent)/ ) {
+                $aim->send_im($sender, "FIXME: recent links here! (not finished yet, sorry");
+        
-        } elsif( $message =~ m/(recent|new)/ ) {
-                $aim->send_im($sender, "FIXME: show the last 10 links");
@@ -73 +151 @@
-
-        } elsif( $message =~ m/status/ ) {
-
-
-
-
+
-                $aim->send_im($sender, Dumper( $sessions_ref ));
-        } elsif( 0 == "check_validation" ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        } elsif( 0 == "waiting_for_validation_phrase" ) {
-                $aim->send_im($sender, "within for this validation, butchy" );
-        } else {
-
-                # no op
-        }
-        return $sessions_ref;
-}
-
+sub is_user_validated {
+        my $sender = shift;
+        my $response = $www->get( "http://www.feedmelinks.com/api/backroom/is_im_account_known&user=$sender" , []);
+        my $xp = XML::XPath->new(xml => $response->content);
+        my $is_valid = $xp->findnodes('/rest/user/@valid');
+        $is_valid .= "";
+        my $fml_user = $xp->getNodeText("/rest/user");
+
+        if( $is_valid ) {
+                print "this AIM account is associated with FML account $fml_user and has been validated\n";
+                return "" . $fml_user; # stupid string conversion
+        } else {
+                print "(not showing username $fml_user cause it hasn't been validated -- could be anyone)\n";
+                return 0;
+        }
+        # "Welcome to the Feed Me Links bot. To link your AIM account to your feed me links account, just click this link: http://feedmelinks.com/set-up/IM?im_name=$sender "
+}
+
+sub get_proxy {
+        my( $u, $p ) = @_;
+        my $www = LWP::UserAgent->new;
+        $www->credentials(
+                "www." . FeedMeLinks::Environment::get_domain() . ":80",
+                'Feed_Me_Links_XML_API',
+                $u => $p
+        );
+        return $www;
+}
+
+sub get_title_for_url {
+        my $url = $_[0];
+        ($fh, $file) = mkstemp( "fml_aim_pagetitle_url_XXXX" );
+
+        my $ua = LWP::UserAgent->new();
+        my $response = $ua->get($url, ':content_file' => $file);
+
+        my $p = HTML::TokeParser->new($file);
+        my $title = "";
+        if ($p->get_tag("title")) {
+                $title = $p->get_trimmed_text;
+        }
+        unlink( $file );
+        return Encode::encode_utf8( $title );
+        #return $title;
+}
+
+sub strip_html {
+        my $html = $_[0];
+        my $hs = HTML::Strip->new();
+        my $clean_text = $hs->parse( $html );
+        return $clean_text;
+}
+
-sub print_version { print get_version() . "\n"; }
-3
+4
-
-1; # modules must return a true value

feedmelinks/modules/main-interface.inc.php

@@ -16 +16 @@
-<big style='margin-left: 6px;'>
-        You have <?= number_format( $num_links ) ?> links and <?= number_format( $num_tags ) ?> tags.
+        <p/>
+        <a href="/export">Export a copy of your links</a>
-</big>
-<?php

feedmelinks/modules/utils.inc.php

@@ -115 +115 @@
-        $q = run_query( $qs );
-        export_driver( $u, $select, $format, $q );
-
-
-
+
+
-        return $data;
-        $data = force_valid_xml( $data );
-}
-

feedmelinks/set-up/IM.php

@@ -11 +11 @@
-<?php
-        if( $tok && $tok == md5( getPasswdForUser( $u )) ) {
+                $stored_aim = get_IM_address_for_user( $u );
+                if( $stored_aim && $stored_aim == $aim ) {
+                        echo bounceTo( "/validate/IM" );
+                        return;
+                }
+
-    $con_account = mysql_connect();
-    mysql_selectdb( getDBName() );
@@ -26 +32 @@
-<div id="challenge">
-        <h1>Success! Your Validation Code is:</h1>
- me: <?=
+: <?= $u . ", " .
-        <small>Paste the above text into your AIM window to finish the setup process</small>
-        <br /><br /><br /><br />
-
-
-
+
-</div>
-
@@ -52 +56 @@
-                                        <input type="hidden" name="op" value="update-im" />
-                                        My AIM name:
-
+aim ? $aim : $
-                                        &nbsp; <input type="submit" class="default button" style="padding: 0.4em; font-size: 14px;" value="Add AIM Account" />
-                                        <br />

feedmelinks/style/validation.css

@@ -3 +3 @@
-.copyable {
-        font-size: 24px;
-1.0
+0.5
-        margin: 10px;
-        border: 1px dotted gray;
@@ -16 +16 @@
-#challenge h1 {
-        margin-bottom: 0px;
+
-}
-#challenge {
-        text-align: center;
-5
+6
-}

feedmelinks/validate/IM.php

@@ -16 +16 @@
-                <div id="challenge">
-                        <h1>Your Validation Code is:</h1>
-<?= get_im_validation_phrase_for_user( $u ) ?>" size="2
-above phrase into AIM when asked for your challenge code
+validate: <?= "$u, " . get_im_validation_phrase_for_user( $u ) ?>" size="3
+phrase from the above box into your AIM window.
-                </div>
-