Added blocking and regular expressions for domains.

appleseedproj · Dec 28, 2010 · 0dd00f1 · 0dd00f1
1 parent f449142
commit 0dd00f1
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/components/login/languages/en-US/login.lang b/components/login/languages/en-US/login.lang
@@ -9,6 +9,8 @@ INVALID_CALLBACK="A system error occurred: Invalid Callback."
 INVALID_NODE="This is not a valid Appleseed node."
 NOT_LOGGED_IN_TO_NODE="You are not logged in to this Appleseed node."
 
+BLOCKED_NODE="This node has been blocked by the Administrator. "
+
 [password_reset]
 PASSWORD_RESET_CLICK_HERE="Click here to login:"
 PASSWORD_RESET_FROM="password@%domain$s"

diff --git a/hooks/quicksocial/libraries/QuickSocial-0.1.0/quicknode.php b/hooks/quicksocial/libraries/QuickSocial-0.1.0/quicknode.php
@@ -95,7 +95,7 @@ public function ReplyToSynchronize ( ) {
 
 		$verified = $this->Verify ( null, $source, $token );
 		if ( $verified->success != 'true' ) {
-			$this->_Error ( "Invalid Token" );
+			$this->_Error ( 'Invalid Node' );
 			exit;
 		}
 

diff --git a/hooks/quicksocial/libraries/QuickSocial-0.1.0/quicksocial.php b/hooks/quicksocial/libraries/QuickSocial-0.1.0/quicksocial.php
@@ -191,6 +191,21 @@ public function ReplyToRemoteVerify ( ) {
 
 	}
 
+	public function Blocked ( ) {
+
+		$fCheckBlocked = $this->GetCallback ( 'CheckBlocked' );
+
+		if ( !is_callable ( $fCheckBlocked ) ) $this->_Error ( 'Invalid Callback: CheckBlocked' );
+
+		$source = $this->_GET['_source'];
+
+		$result = @call_user_func ( $fCheckBlocked, $source );
+
+		if ( !$result ) $this->_Error ( 'Blocked' );
+
+		return ( true );
+	}
+
 	protected function _Error ( $pError ) {
 
 		$return = array (

diff --git a/hooks/quicksocial/quicksocial.php b/hooks/quicksocial/quicksocial.php
@@ -38,21 +38,24 @@ public function EndSystemInitialize ( $pData = null ) {
 
 		if ( $social != 'true' ) return ( false );
 
+		require ( ASD_PATH . 'hooks' . DS . 'quicksocial' . DS . 'libraries' . DS . 'QuickSocial-0.1.0' . DS . 'quicksocial.php' );
+
+		$social = new cQuickSocial ();
+		$social->SetCallback ( 'CheckBlocked', array ( $this, '_CheckBlocked' ) );
+
+		$social->Blocked();
+
 		$task = $this->GetSys ( 'Request' )->Get ( '_task' );
 
 		switch ( $task ) {
 			case 'verify':
-				require ( ASD_PATH . 'hooks' . DS . 'quicksocial' . DS . 'libraries' . DS . 'QuickSocial-0.1.0' . DS . 'quicksocial.php' );
-
 				$social = new cQuickSocial ();
 				$social->SetCallback ( 'CheckLocalToken', array ( $this, '_CheckLocalToken' ) );
 
 				$social->ReplyToVerify();
 				exit;
 			break;
 			case 'verify.remote':
-				require ( ASD_PATH . 'hooks' . DS . 'quicksocial' . DS . 'libraries' . DS . 'QuickSocial-0.1.0' . DS . 'quicksocial.php' );
-
 				$social = new cQuickSocial ();
 				$social->SetCallback ( 'CheckLocalToken', array ( $this, '_CheckLocalToken' ) );
 
@@ -187,6 +190,20 @@ public function EndSystemInitialize ( $pData = null ) {
 
 	}
 
+	public function _CheckBlocked ( $pSource ) {
+
+		list ( $trusted, $discovered, $blocked ) = $this->_LoadNodeNetwork ( );
+
+		foreach ( $blocked as $b => $block ) {
+			$pattern = '/^' . $block . '$/';
+			if ( preg_match ( $pattern, $pSource ) ) {
+				return ( false );
+			}
+		}
+
+		return ( true );
+	}
+
 	public function OnLoginAuthenticate ( $pData ) {
 
 		if (!class_exists ( 'cQuickNode' ) ) require ( ASD_PATH . 'hooks' . DS . 'quicksocial' . DS . 'libraries' . DS . 'QuickSocial-0.1.0' . DS . 'quicknode.php' );
@@ -195,6 +212,12 @@ public function OnLoginAuthenticate ( $pData ) {
 
 		$domain = $pData['domain'];
 
+		if ( !$this->_CheckBlocked ( $domain ) ) {
+			$return = new stdClass();
+			$return->error = 'Blocked Node';
+			return ( $return );
+		}
+
 		$node->SetCallback ( 'CheckLocalToken', array ( $this, '_CheckLocalToken' ) );
 		$node->SetCallback ( 'CreateLocalToken', array ( $this, '_CreateLocalToken' ) );
 		$node->SetCallback ( 'LogNetworkRequest', array ( $this, '_LogNetworkRequest' ) );