? 1012132.patch
? 1016350.patch
Index: services.runtime.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/services/services.runtime.inc,v
retrieving revision 1.4
diff -u -p -r1.4 services.runtime.inc
--- services.runtime.inc	24 Dec 2010 17:25:13 -0000	1.4
+++ services.runtime.inc	9 Jan 2011 20:06:00 -0000
@@ -88,14 +88,12 @@ class ServicesArgumentException extends 
  *  An array containing information about the controller
  * @param array $args
  *  The arguments that should be passed to the controller.
- * @param array $auth_args
- *  The arguments that should be passed to the authentication module.
  * @param array $options
  *  Options for the execution. Use 'skip_authentication'=>TRUE to skip the
  *  services-specific authentication checks. Access checks will always be
  *  made.
  */
-function services_controller_execute($controller, $args = array(), $auth_args = array(), $options = array()) {
+function services_controller_execute($controller, $args = array(), $options = array()) {
   $server_info =  services_server_info_object();
   if($server_info->debug) {
     watchdog('services', '<pre>Controller: '. print_r($controller, 1));
@@ -199,18 +197,15 @@ function services_authentication_info($m
  *  Optional. Second argument to pass to the callback.
  * @param string $arg3
  *  Optional. Third argument to pass to the callback.
- * @param string $arg4
- *  Optional. Fourth argument to pass to the callback.
  * @return mixed
  *
  * Aren't these really the following?
  *  arg1 = Settings
  *  arg2 = Method
  *  arg3 = Controller
- *  arg4 = Auth args  
  *
  */
-function services_auth_invoke($module, $method, &$arg1 = NULL, &$arg2 = NULL, &$arg3 = NULL, $arg4 = NULL) {
+function services_auth_invoke($module, $method, &$arg1 = NULL, &$arg2 = NULL, &$arg3 = NULL) {
   // Get information about the auth module
   $info = services_authentication_info($module);
   $func = $info && !empty($info[$method]) ? $info[$method] : FALSE;
@@ -222,7 +217,7 @@ function services_auth_invoke($module, $
     if (is_callable($func)) {
       $args = func_get_args();
       // Replace module and method name and arg1 with reference to $arg1 and $arg2.
-      array_splice($args, 0, 5, array(&$arg1, &$arg2, &$arg3, &$arg4));
+      array_splice($args, 0, 5, array(&$arg1, &$arg2, &$arg3));
       return call_user_func_array($func, $args);
     }
   }
Index: auth/services_sessauth/services_sessauth.inc
===================================================================
RCS file: auth/services_sessauth/services_sessauth.inc
diff -N auth/services_sessauth/services_sessauth.inc
--- auth/services_sessauth/services_sessauth.inc	10 Dec 2010 03:10:27 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<?php
-// $Id: services_sessauth.inc,v 1.2 2010/12/10 03:10:27 ocyrus Exp $
-
-/**
- * @file
- *  The implementation of the session authentication scheme
- */
-
-function _services_sessauth_authenticate_call($settings, $method, &$args, $auth_args) {
-  // Anyone passing in a specific session id to use, should do so in the 
-  // 'sessid' key. Otherwise, just use the current session (IE do nothing.)
-  if (isset($auth_args['sessid'])) {
-    // Add additonal processing for methods requiring session
-    $session_backup = NULL;
-    $sessid = $auth_args['sessid'];
-    if (empty($sessid)) {
-      return t('Invalid sessid.');
-    }
-    $session_backup = services_session_load($sessid);
-  }
-}
-
-function _services_sessauth_security_settings() {
-  return array();
-}
Index: auth/services_sessauth/services_sessauth.info
===================================================================
RCS file: auth/services_sessauth/services_sessauth.info
diff -N auth/services_sessauth/services_sessauth.info
--- auth/services_sessauth/services_sessauth.info	10 Dec 2010 03:10:27 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-; $Id: services_sessauth.info,v 1.2 2010/12/10 03:10:27 ocyrus Exp $
-name = Session Authentication
-description = Provides session authentication for the services module
-package = Services - authentication
-dependencies[] = services
-core = 7.x
\ No newline at end of file
Index: auth/services_sessauth/services_sessauth.module
===================================================================
RCS file: auth/services_sessauth/services_sessauth.module
diff -N auth/services_sessauth/services_sessauth.module
--- auth/services_sessauth/services_sessauth.module	10 Dec 2010 03:10:27 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-<?php
-// $Id: services_sessauth.module,v 1.2 2010/12/10 03:10:27 ocyrus Exp $
-/**
- * @file
- *  Provides a key based validation system.
- */
-
-/**
- * Implementation of hook_authentication_info().
- *
- * @return array
- *  The configuration array for the authentication scheme
- */
-function services_sessauth_services_authentication_info() {
-  return array(
-    'file' => 'services_sessauth.inc',
-    'title' => t('Session authentication'),
-    'description' => t('The default session based authentication'),
-    'authenticate_call' => '_services_sessauth_authenticate_call',
-    'security_settings' => '_services_sessauth_security_settings',
-    'controller_settings' => '_services_sessauth_security_settings',
-  );
-}
-
-
-// These don't currently do anything, need to conform to new cache keys
-// $cache_key = 'services:' . $endpoint_name . ':resources';
-function services_sessauth_disable() {
-  cache_clear_all('services:methods', 'cache');
-}
-
-function services_sessauth_enable() {
-  cache_clear_all('services:methods', 'cache');
-}
Index: servers/rest_server/includes/RESTServer.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/services/servers/rest_server/includes/RESTServer.inc,v
retrieving revision 1.4
diff -u -p -r1.4 RESTServer.inc
--- servers/rest_server/includes/RESTServer.inc	7 Jan 2011 19:19:31 -0000	1.4
+++ servers/rest_server/includes/RESTServer.inc	9 Jan 2011 20:06:01 -0000
@@ -67,9 +67,6 @@ class RESTServer {
     $data = array();
     $arguments = $this->getControllerArguments($controller, $path, $method, $data);
 
-    // Any authentication needed for REST Server must be set in the cookies
-    $auth_arguments = $_COOKIE;
-
     $formats = $this->responseFormatters();
 
     // Negotiate response format based on accept-headers if we
@@ -140,7 +137,7 @@ class RESTServer {
       }
     }
 
-    $result = services_controller_execute($controller, $arguments, $auth_arguments);
+    $result = services_controller_execute($controller, $arguments);
     $formatter = $formats[$response_format];
 
     // Set the content type and render output