Changeset 144

Timestamp:

12/27/07 00:53:51 (1 year ago)

Author:

pamela

Message:

updating pwwp trunk to RB-0.9

Files:

• trunk/dist (copied) (copied from branches/RB-0.9/dist)
• trunk/dist/wp-infocard.v09.tar.gz (copied) (copied from branches/RB-0.9/dist/wp-infocard.v09.tar.gz)
• trunk/wp-infocard (modified) (1 prop)
• trunk/wp-infocard/pw-config.php (modified) (1 diff)
• trunk/wp-infocard/site-messages/en-us/new-email.html (modified) (1 diff)
• trunk/wp-infocard/site-messages/en-us/to-be-verified-new-user.html (copied) (copied from branches/RB-0.9/wp-infocard/site-messages/en-us/to-be-verified-new-user.html)
• trunk/wp-infocard/site-messages/en-us/trusted-new-email.html (copied) (copied from branches/RB-0.9/wp-infocard/site-messages/en-us/trusted-new-email.html)
• trunk/wp-infocard/site-messages/en-us/verified-new-email.html (copied) (copied from branches/RB-0.9/wp-infocard/site-messages/en-us/verified-new-email.html)
• trunk/wp-infocard/site-messages/infocard-usermessage.php (modified) (1 diff)
• trunk/wp-infocard/wp-infocard.php (modified) (2 diffs)
• trunk/wp-infocard/wp/admin.pw.php (modified) (12 diffs)
• trunk/wp-infocard/wp/clickback.pw.php (modified) (3 diffs)
• trunk/wp-infocard/wp/db_upgrade.pw.php (copied) (copied from branches/RB-0.9/wp-infocard/wp/db_upgrade.pw.php)
• trunk/wp-infocard/wp/login/infocard-clickback.php (modified) (2 diffs)
• trunk/wp-infocard/wp/login/infocard-login.php (modified) (1 diff)
• trunk/wp-infocard/wp/login/infocard-newcard.php (copied) (copied from branches/RB-0.9/wp-infocard/wp/login/infocard-newcard.php)
• trunk/wp-infocard/wp/processing.pw.php (modified) (3 diffs)
• trunk/wp-infocard/wp/pw-config.php.wp (deleted)
• trunk/wp-infocard/wp/userdata.pw.php (modified) (20 diffs)
• trunk/wp-infocard/wp/utils.pw.php (modified) (5 diffs)

trunk/wp-infocard/pw-config.php

@@ -7 +7 @@
-define ('PW_SHOW_BINARY', FALSE);
-define ('PW_PLUGINPATH', '/wp-content/plugins/wp-infocard');
-
-
+
+
+
-define ('PW_USECAPTCHAS', false );
-define ('PW_DEBUG_ON', get_settings('pw_debug_on'));
+define ('PW_DEBUG_LEVEL', '0');
-define ('PW_SELECTOR_TRIGGER', get_settings('pw_selector_trigger'));
-define ('PW_CUSTOM_DATA', get_settings('pw_custom_data'));

trunk/wp-infocard/site-messages/en-us/new-email.html

@@ -1 @@
-
-
+
+
+
+
+

trunk/wp-infocard/site-messages/infocard-usermessage.php

@@ -2 +2 @@
-<?php
-$messageType = $_REQUEST['mesg'];
+
-
-include_once( dirname(__FILE__) . '/../' . '/pw-config.php');

trunk/wp-infocard/wp-infocard.php

@@ -3 +3 @@
-Plugin Name: PamelaWare Information Card Login
-Plugin URI: http://code.pamelaproject.com/wiki/PWwordpress
- Option
-b3
+
+v0.9 
-Author: K. Cameron, P. Dingle, and more
-Author URI: https://pamelaproject.com/svn/pw/pwcommon/legal/CONTRIBUTORS
@@ -47 +47 @@
-// function to add information card link to wp-login.php 
-add_action( 'login_form', array( $wpInfocard, 'pw_loginform_link'));
+add_action( 'register_form', array( $wpInfocard, 'pw_registerform_link'));
-
-//if ( PW_USECAPTCHAS )

trunk/wp-infocard/wp/admin.pw.php

@@ -11 +11 @@
-include_once( dirname(__FILE__) . '/../pwlib/admin.pwlib.php');
-include_once( dirname(__FILE__) . '/processing.pw.php');
+include_once( dirname(__FILE__) . '/utils.pw.php');
-//require_once( ABSPATH . WPINC . '/registration-functions.php');
-/*
@@ -62 +63 @@
-
-                $myTableAuditQuery =
-
+IF NOT EXISTS 
-                                                `cardhash` text default '',
-                                                `accountid` bigint(20) unsigned,
@@ -168 +169 @@
-                foreach ( $wpdb->get_col("SHOW TABLES", 0) as $table )
-                {
-identity
+options
-                        {
-                                return true;
@@ -185 +186 @@
-        {
-                global $wpdb;
+                pw_admin::createInfocardAuditTable();
+                pw_admin::createInfocardIdentityTable();
-
-                $isAuditTableCreated = $this->_createAuditTable();
@@ -198 +201 @@
-                $this->createOption('pw_securesiteurl', $https_url);
-
+                $this->createOption('pw_db_version', PW_DB_VERSION);
-                $this->createOption('pw_debug_on', 0);
-                $this->createOption('pw_enable_pass', 0);
@@ -236 +240 @@
-        {
-                global $current_user;
-
-
-
-
-
-
-
-
+
-
-                $chunk = "";
-                if( !$current_user->ID )
-                {
-
+
+
-                        // note I set the CSS styles inline because otherwise
-                        // the user has to link infocard.css - not worth it
-                        // for this one icon
-/li><
+
-                        . PW_SECUREPLUGINURL .'/' . PW_PLUGIN
-                        . '/login/infocard-login.php" alt="'
-                        . __('Information Card Login')
-
+ style="border-bottom:none;"
-                        . PW_IMGURL . '/' .PW_FP_ICON 
-/></a
+ style="border:none; border-bottom: none; background: none;"/></a></div
-                }
- 
+
-        } //end function pw_frontpage_link
-
@@ -280 +278 @@
-        } //end function pw_loginform_link
-
+
+        function pw_registerform_link()
+        {
+//              if ( PW_USECAPTCHAS )
+//                      display_cryptographp();
+?>
+        <hr />
+                <a href="<?php echo PW_SECUREPLUGINURL . '/' . PW_PLUGIN; ?>/login/infocard-login.php" alt="<?php pw_utils::screenPrint('Infocard Login'); ?>" style="border-bottom: none; color: #FFF">
+                        <?php pw_utils::screenPrint('Register using an Information Card'); ?>
+                        <br/>
+                        <img src="<?php echo PW_IMGURL; ?>/infocard_60x42.png" style="padding:10px" />
+                </a>
+                &nbsp; <a alt="<?php echo __('What is this?'); ?>" style="border-bottom: none; color: #fff"  href="http://pamelaproject.com/">
+                        <?php echo __('(what is this?)'); ?>
+                </a>
+<?php
+        } //end function pw_registerform_link
+
-        function pw_printUserCardStatus()
-        {
@@ -292 +308 @@
-?>
-                        <p>
-
+
+
+
+
+
-                        </p>
-
@@ -302 +322 @@
-                                . "<label for='Information Card Info' style='display: inline'><img src=\""
-                                . PW_IMGURL
-c-logo/ic-logo-
+nfocard_60x42_
-                                . " style='vertical-align: middle'/> &nbsp;";
-in use
+associated with this account
-                                echo "</label></p>";
-                }
@@ -319 +339 @@
-        function getOption($attr_name)
-        {
-settings
+option
-        } //end function getOption
-
-        /*
-                Function: createNewAccount
-                Description: creates a new db record
-                Input: account details
-                Output: returns the user Id on success, FALSE on failure
-                Side effect: none
-        */
-        function createNewAccount( $datamap )
-        {
-                require_once( ABSPATH . WPINC . '/registration-functions.php');
-
-                $user_login = $datamap['user_login']->new_value;
-                $user_firstname = $datamap['first_name']->new_value;
-                $user_lastname = $datamap['last_name']->new_value;
-                $user_email = $datamap['user_email']->new_value;
-                $display_name = $datamap['display_name']->new_value;
-                $user_nicename = $display_name;
-                $user_pass = MD5($datamap['cardhash']->new_value);
-                $user_url = $datamap['user_url']->new_value;
-
-                InfocardUtils::printDebug("<br/>Action: createNewAccount<br>");
-                InfocardUtils::printDebug("<br/>Nice Name: $user_nicename<br>");
-                $userdata = compact('user_login', 'user_pass', 'user_email', 'user_nicename', 'user_url', 'display_name', 'user_firstname', 'user_lastname');
-                $user_ID = wp_insert_user($userdata);
-
-                if ($user_ID) 
-                {
-                        InfocardUtils::printDebug("&nbsp;Inserted record # $user_ID<br>");
-                        return $user_ID;
-                }
-                else
-                {
-                        InfocardUtils::printDebug("&nbsp;Error - new user not created<br/>");
-                        return FALSE;
-                }
-        } // end function createNewAccount
-
-        function createOption( $option_name, $option_value )
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        function pwAdminScreen()
-        {
@@ -369 +363 @@
-                $opts = pw_admin::updateAdminOptions();
-                // write submitted changes if this page reload shows a submit
+                if (pw_utils::databaseUpToDate())
+                {
+                        echo "<p>Plugin Version: ". PW_VERSION . " " . PW_VERSION_DATE 
+                        . " (" . $opts['pw_db_version'] . ")</p>";
+                }
+                else            
+                {
+?>
+                <form  action="" method="post">
+<?php
+                        echo "<div id='message' class='updated'>" . pw_admin::fixDatabase() . "</div>";
+?>
+                        <input type="submit" name="infocard_admin_upgrade" id="infocard_admin_upgrade" value="Continue" />
+                </form>
+<?php
+                        return;
+                }
-
-                pw_admin::printSystemCheck($opts['pw_securesiteurl']);
@@ -491 +502 @@
-                return $option_val;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-} // end class pw_admin

trunk/wp-infocard/wp/clickback.pw.php

@@ -42 +42 @@
-                }
-
-
-
-
-
+
+
+
-
-                $data = MD5($clickback_salt . $data);
@@ -51 +50 @@
-                $chopped = substr($data, 0, PW_CLICKBACK_LENGTH);
-
-Clickback: Hash of the salted challenge data: $data<br/
-Clickback: Chopped challenge data: $chopped <br/>"
+<li>Hash of the salted challenge data: $data</li
+<li>Chopped challenge data: $chopped</li></ul>", 2
-
-                return ($chopped);
@@ -108 +107 @@
-        // Output:              none
-        // Side Effects: sends an email
-
+, $function='registration'
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $clickbackUrl = PW_SECUREPLUGINURL . "/" . PW_PLUGIN . "/login/infocard-clickback.php?clickbackID=" . $clickbackID;
-
-
-
+
-                // sendEmail: to-address, subject, body
-'New InfoCard Registration'
+$email_title
-
-                pw_utils::printDebug( "<br/><br/>Account Validation is required.<br/>"

trunk/wp-infocard/wp/login/infocard-clickback.php

@@ -21 +21 @@
-        </title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+'ssl'
-        <script type="text/javascript" src="<?php echo pw_utils::printJqueryLocation(); ?>"></script>
-        <script>
@@ -101 +101 @@
-        </div>
-        <div id="pw_login_footer">
-://pamelaproject.com" alt="Powered by PamelaWare"><img src='<?php pw_utils::displayPamelaProjectLogo(
+s://pamelaproject.com" alt="Powered by PamelaWare"><img src='<?php pw_utils::displayPamelaProjectLogo('ssl'
-        </div>
-  </div>

trunk/wp-infocard/wp/login/infocard-login.php

@@ -32 +32 @@
-</head>
-<body>
+<?php
+        if ( !($_SERVER['HTTPS']) || !(strtolower($_SERVER['HTTPS']) == 'on'))
+        {
+                pw_utils::errorPageRedirect('NOHTTPS');
+        }
+
+?>
-  <div id="pw_login_main">
-        <div id="pw_login_header">

trunk/wp-infocard/wp/processing.pw.php

@@ -26 +26 @@
-                pw_utils::printDebug("&nbsp;Login ID: ".$datamap['user_login']->new_value."<br />");
-                pw_utils::printDebug("&nbsp;Account ID: ".$datamap['ID']->new_value."<br />");
-
+User 
-
-                pw_utils::printDebug("&nbsp;Errors: "); 
@@ -34 +34 @@
-                        pw_utils::printDebug(" none<br />");
-
-
-
-
-
-
+
-
-                pw_utils::printDebug("&nbsp;Account Validation: ");
-
-Sent
+ === 'validate'
+Required
-                else
-                        pw_utils::printDebug("Not needed<br/>");
@@ -51 +47 @@
-        } // end function showProcessingSummary
-
+        /*
+                Function:       getDBv1CardHash
+                Description:    Before we started storing card hash, we stored
+                                the PPID and an MD5 hash of the base64-decoded
+                                modulus.
+                                This means that when we upgraded the database
+                                from v1 to v3, we had to make a hash out of
+                                the ppid and the md5 hash, not the ppid and the
+                                modulus.
+                Input:          none
+                Output:         SHA256 card hash with ppid 
+                                        & md5(base64_decode(modulus))
+        */
+        function getDBv1CardHash()
+        {
+                global $claimslist;
+
+                $mod = md5(base64_decode($claimslist['signerkeymodulus']->token_value));
+                pw_utils::printDebug('<br/>Checking DBv1 card hash<br/>', 1);
+                pw_utils::printDebug('--Modulus:  ' . $mod . '<br/>', 1);
+                
+                $cardhash = pw_processing::calculateCardHash(
+                        $claimslist['privatepersonalidentifier']->token_value,
+                        $mod
+                );
+                pw_utils::printDebug('--CardHash:  ' . $cardhash . '<br/>', 1);
+                return $cardhash;
+        } //end function getDBv1CardHash
+        
-} // end class pw_processing
-?>

trunk/wp-infocard/wp/userdata.pw.php

@@ -22 +22 @@
-class pw_userdata extends pwlib_userdata
-{
-        // Function:  evaluateIncomingRequest
-        // Description: decides what kind of user is connecting.
-        // Input: email, modulus, ppid from incoming request
-        // Output: An array of user information. With the
-        //                      following indices:
-        //                      array['status'] - contains 1 of these statuses:
-        //                      1. valid-user - supplied email address exists
-        //                      and belongs to same user as supplied modulus/ppid
-        //                      2. new-user - email address & modulus/ppid are new
-        //                      3. new-card - email address exists but modulus is new
-        //                      4. new-email - modulus/ppid exists but email is new
-        //                      5. an error code
-        //
-        //              array['id'] - contains the user id number (or 0 if the status 
-        //              is anything other than valid-user)
-        // Side-effects: none
-        function evaluateIncomingRequest()
-        {
-                global $wpdb, $claimslist, $datamap;
-                $incominguser['id'] = 0;
-                $incominguser['status'] = 'UNKNOWNERROR';
-                $identity_user_id = 0;
-
-                $cardhash = pw_processing::getCardHash();
-                pw_utils::printDebug( '<br/>Evaluating Incoming Request:<br/>');
-
-                if (!is_email($claimslist['emailaddress']->token_value))
-                {
-                        $incominguser['status'] = "INVALIDEMAIL";
-                        return $incominguser;
-                }
-                
-                $query = "SELECT * FROM `" . PW_TABLE_PREFIX 
-                        . "infocard_identities` WHERE cardhash = '"
-                        . $cardhash . "'";
-                $identity_info = $wpdb->get_results( $query, OBJECT );
-
-                switch (count($identity_info))
-                {
-                        case 1:
-                                // could be valid-user, or new-email
-                                $identity_user_id = $identity_info[0]->accountid;
-                                $datamap['cardhash']->add_db_value($identity_info[0]->cardhash);
-                        break;
-
-                        case 0:
-                                // could be new-card or new-user
-                                $identity_user_id = 0;
-                        break;
-
-                        default:
-                                $incominguser['status'] = "CARDNOTUNIQUE";
-                                return $incominguser;
-                }
-
-                pw_utils::printDebug('&nbsp;&nbsp;Card belongs to account #: ' . $identity_user_id . "<br/>" ); 
-
-                $query = "SELECT * from " . PW_TABLE_PREFIX . "users "
-                        . "WHERE user_email LIKE '"
-                        . $claimslist['emailaddress']->token_value . "'";
-
-                $user_info = $wpdb->get_results( $query, ARRAY_A );
-
-                switch (count($user_info))
-                {
-                        case 1:
-                                $mail_user_id = $user_info[0][ID];
-                                pw_utils::printDebug('&nbsp;&nbsp;User belongs to account #: ' . $mail_user_id . "<br/>" );
-                                if ($identity_user_id == 0)
-                                {
-                                        $incominguser['id'] = $mail_user_id;
-                                        $incominguser['status'] = 'new-card';
-                                }
-                                elseif ($identity_user_id != $mail_user_id)
-                                {
-                                        $incominguser['status'] = "CLAIMSMISMATCHED";
-                                        return $incominguser;
-                                }
-                                if ($identity_user_id == $mail_user_id)
-                                {
-                                        $incominguser['id'] = $mail_user_id;
-                                        $incominguser['status'] = 'valid-user';
-
-                                }
-                                foreach (array_keys($datamap) as $key)
-                                {
-                                        if (array_key_exists($datamap[$key]->mappingattribute, $user_info[0]))
-                                        {
-                                                pw_utils::printDebug('Existing Value: found '.$datamap[$key]->mappingattribute.' in user_info[0]<br/>');
-                                                $datamap[$key]->add_db_value($user_info[0][$datamap[$key]->mappingattribute]);
-                                        }
-                                }
-
-                                // special case for first, last name
-                                $first = get_usermeta($mail_user_id, 'first_name');
-                                if ($first)
-                                {
-                                        pw_utils::printDebug('Existing Value: found '.$datamap['first_name']->mappingattribute.' in usermeta ( '.$first.' )<br/>');
-                                        $datamap['first_name']->add_db_value( $first );
-                                }
-
-                                $last = get_usermeta($mail_user_id, 'last_name');
-                                if ($last)
-                                {
-                                        pw_utils::printDebug('Existing Value: found '.$datamap['last_name']->mappingattribute.' in usermeta ( '.$last.' )<br/>');
-                                        $datamap['last_name']->add_db_value( $last );
-                                }
-
-                                if ( PW_CUSTOM_DATA )
-                                        pw_customdata::evaluateIncomingCustomData( $mail_user_id );
-                        break;
-
-                        case 0:
-                                $mail_user_id = 0;
-                                if ($identity_user_id == 0)
-                                {
-                                        // no user entry or identity entry
-                                        $incominguser['status'] = 'new-user';
-                                }
-                                else
-                                {
-                                        //identity entry but no mail entry
-                                        $incominguser['id'] = $identity_user_id;
-                                        $incominguser['status'] = 'new-email';
-                                }
-                        break;
-
-                        default:
-                                // More than one record returned for an email address
-                                $incominguser['status'] = "EMAILNOTUNIQUE";
-                                return $incominguser;
-                }
-
-                pw_utils::printDebug( "&nbsp;&nbsp;Email address belongs toaccount #: $mail_user_id <br/>" );
-                pw_utils::printDebug( "&nbsp;&nbsp;Status: " . $incominguser['status'] . "<br/><br/>" );
-
-                return $incominguser;
-        } // end function evaluateIncomingRequest
-
-        function mapTokenData()
-        {
-                global $claimslist, $datamap;
-
+, 1
-                foreach(array_keys($datamap) as $key)
-                {
-                        $datamap[$key]->new_value = eval($datamap[$key]->mappingfunction);
-//pw_utils::printDebug('&nbsp;Mapping Function: '.$datamap[$key]->mappingfunction.'<br/>'
-
-
-
+pw_utils::printDebug('&nbsp;Mapping Function: '.$datamap[$key]->mappingfunction.'<br/>',2
+, 1
+
+, 1
-        } // end