Skip to content
Snippets Groups Projects
Commit 1b867d20 authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Merge branch 'master' of github.com:simplesamlphp/simplesamlphp 

# By Thijs Kinkhorst
# Via Thijs Kinkhorst
* 'master' of github.com:simplesamlphp/simplesamlphp:
  Add more tests for auth proc filters
parents bea07f4e ba3be7c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+ 64
− 8
View file @ 1b867d20
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
{ {
/* /**
* Helper function to run the filter with a given configuration. * Helper function to run the filter with a given configuration.
* *
* @param array $config The filter configuration. * @param array $config The filter configuration.
...@@ -20,7 +20,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -20,7 +20,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
return $request; return $request;
} }
/* /**
* Test the most basic functionality. * Test the most basic functionality.
*/ */
public function testBasic() public function testBasic()
...@@ -37,7 +37,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -37,7 +37,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['test'], array('value1', 'value2')); $this->assertEquals($attributes['test'], array('value1', 'value2'));
} }
/* /**
* Test that existing attributes are left unmodified. * Test that existing attributes are left unmodified.
*/ */
public function testExistingNotModified() public function testExistingNotModified()
...@@ -61,7 +61,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -61,7 +61,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['original2'], array('original_value2')); $this->assertEquals($attributes['original2'], array('original_value2'));
} }
/* /**
* Test single string as attribute value. * Test single string as attribute value.
*/ */
public function testStringValue() public function testStringValue()
...@@ -78,8 +78,8 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -78,8 +78,8 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['test'], array('value')); $this->assertEquals($attributes['test'], array('value'));
} }
/* /**
* Test the most basic functionality. * Test adding multiple attributes in one config.
*/ */
public function testAddMultiple() public function testAddMultiple()
{ {
...@@ -98,7 +98,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -98,7 +98,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['test2'], array('value2')); $this->assertEquals($attributes['test2'], array('value2'));
} }
/* /**
* Test behavior when appending attribute values. * Test behavior when appending attribute values.
*/ */
public function testAppend() public function testAppend()
...@@ -116,7 +116,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -116,7 +116,7 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['test'], array('value1', 'value2')); $this->assertEquals($attributes['test'], array('value1', 'value2'));
} }
/* /**
* Test replacing attribute values. * Test replacing attribute values.
*/ */
public function testReplace() public function testReplace()
...@@ -135,4 +135,60 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase ...@@ -135,4 +135,60 @@ class Test_Core_Auth_Process_AttributeAdd extends PHPUnit_Framework_TestCase
$this->assertEquals($attributes['test'], array('value2')); $this->assertEquals($attributes['test'], array('value2'));
} }
/**
* Test wrong usage generates exceptions
*
* @expectedException Exception
*/
public function testWrongFlag()
{
$config = array(
'%nonsense',
'test' => array('value2'),
);
$request = array(
'Attributes' => array(
'test' => array('value1'),
),
);
$result = self::processFilter($config, $request);
}
/**
* Test wrong attribute name
*
* @expectedException Exception
*/
public function testWrongAttributeName()
{
$config = array(
'%replace',
array('value2'),
);
$request = array(
'Attributes' => array(
'test' => array('value1'),
),
);
$result = self::processFilter($config, $request);
}
/**
* Test wrong attribute value
*
* @expectedException Exception
*/
public function testWrongAttributeValue()
{
$config = array(
'%replace',
'test' => array(true),
);
$request = array(
'Attributes' => array(
'test' => array('value1'),
),
);
$result = self::processFilter($config, $request);
}
} }
tests/modules/core/lib/Auth/Process/AttributeCopyTest.php 0 → 100644
+ 140
− 0
View file @ 1b867d20
<?php
/**
* Test for the core:AttributeCopy filter.
*/
class Test_Core_Auth_Process_AttributeCopy extends PHPUnit_Framework_TestCase
{
/**
* Helper function to run the filter with a given configuration.
*
* @param array $config The filter configuration.
* @param array $request The request state.
* @return array The state array after processing.
*/
private static function processFilter(array $config, array $request)
{
$filter = new sspmod_core_Auth_Process_AttributeCopy($config, NULL);
$filter->process($request);
return $request;
}
/**
* Test the most basic functionality.
*/
public function testBasic()
{
$config = array(
'test' => 'testnew',
);
$request = array(
'Attributes' => array('test' => array('AAP')),
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertArrayHasKey('test', $attributes);
$this->assertArrayHasKey('testnew', $attributes);
$this->assertEquals($attributes['testnew'], array('AAP'));
}
/**
* Test that existing attributes are left unmodified.
*/
public function testExistingNotModified()
{
$config = array(
'test' => 'testnew',
);
$request = array(
'Attributes' => array(
'test' => array('AAP'),
'original1' => array('original_value1'),
'original2' => array('original_value2'),
),
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertArrayHasKey('testnew', $attributes);
$this->assertEquals($attributes['test'], array('AAP'));
$this->assertArrayHasKey('original1', $attributes);
$this->assertEquals($attributes['original1'], array('original_value1'));
$this->assertArrayHasKey('original2', $attributes);
$this->assertEquals($attributes['original2'], array('original_value2'));
}
/**
* Test copying multiple attributes
*/
public function testCopyMultiple()
{
$config = array(
'test1' => 'new1',
'test2' => 'new2',
);
$request = array(
'Attributes' => array('test1' => array('val1'), 'test2' => array('val2.1','val2.2')),
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertArrayHasKey('new1', $attributes);
$this->assertEquals($attributes['new1'], array('val1'));
$this->assertArrayHasKey('new2', $attributes);
$this->assertEquals($attributes['new2'], array('val2.1','val2.2'));
}
/**
* Test behaviour when target attribute exists (should be replaced).
*/
public function testCopyClash()
{
$config = array(
'test' => 'new1',
);
$request = array(
'Attributes' => array(
'test' => array('testvalue1'),
'new1' => array('newvalue1'),
),
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertEquals($attributes['new1'], array('testvalue1'));
}
/**
* Test wrong attribute name
*
* @expectedException Exception
*/
public function testWrongAttributeName()
{
$config = array(
array('value2'),
);
$request = array(
'Attributes' => array(
'test' => array('value1'),
),
);
$result = self::processFilter($config, $request);
}
/**
* Test wrong attribute value
*
* @expectedException Exception
*/
public function testWrongAttributeValue()
{
$config = array(
'test' => array('test2'),
);
$request = array(
'Attributes' => array(
'test' => array('value1'),
),
);
$result = self::processFilter($config, $request);
}
}
tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php 0 → 100644
+ 171
− 0
View file @ 1b867d20
<?php
/**
* Test for the core:ScopeAttribute filter.
*/
class Test_Core_Auth_Process_ScopeAttribute extends PHPUnit_Framework_TestCase
{
/*
* Helper function to run the filter with a given configuration.
*
* @param array $config The filter configuration.
* @param array $request The request state.
* @return array The state array after processing.
*/
private static function processFilter(array $config, array $request)
{
$filter = new sspmod_core_Auth_Process_ScopeAttribute($config, NULL);
$filter->process($request);
return $request;
}
/*
* Test the most basic functionality.
*/
public function testBasic()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'eduPersonPrincipalName' => array('jdoe@example.com'),
'eduPersonAffiliation' => array('member'),
)
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertArrayHasKey('eduPersonScopedAffiliation', $attributes);
$this->assertEquals($attributes['eduPersonScopedAffiliation'], array('member@example.com'));
}
/*
* If scope already set, module must add, not overwrite.
*/
public function testNoOverwrite()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'eduPersonPrincipalName' => array('jdoe@example.com'),
'eduPersonAffiliation' => array('member'),
'eduPersonScopedAffiliation' => array('library-walk-in@example.edu'),
)
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertEquals($attributes['eduPersonScopedAffiliation'], array('library-walk-in@example.edu', 'member@example.com'));
}
/*
* If source attribute not set, nothing happens
*/
public function testNoSourceAttribute()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'mail' => array('j.doe@example.edu', 'john@example.org'),
'eduPersonAffiliation' => array('member'),
'eduPersonScopedAffiliation' => array('library-walk-in@example.edu'),
)
);
$result = self::processFilter($config, $request);
$this->assertEquals($request['Attributes'], $result['Attributes']);
}
/*
* If scope attribute not set, nothing happens
*/
public function testNoScopeAttribute()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'mail' => array('j.doe@example.edu', 'john@example.org'),
'eduPersonScopedAffiliation' => array('library-walk-in@example.edu'),
'eduPersonPrincipalName' => array('jdoe@example.com'),
)
);
$result = self::processFilter($config, $request);
$this->assertEquals($request['Attributes'], $result['Attributes']);
}
/*
* When multiple @ signs in attribute, will use the first one.
*/
public function testMultiAt()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'eduPersonPrincipalName' => array('john@doe@example.com'),
'eduPersonAffiliation' => array('member'),
)
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertEquals($attributes['eduPersonScopedAffiliation'], array('member@doe@example.com'));
}
/*
* When multiple values in source attribute, should render multiple targets.
*/
public function testMultivaluedSource()
{
$config = array(
'scopeAttribute' => 'eduPersonPrincipalName',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'eduPersonPrincipalName' => array('jdoe@example.com'),
'eduPersonAffiliation' => array('member','staff','faculty'),
)
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertEquals($attributes['eduPersonScopedAffiliation'], array('member@example.com','staff@example.com','faculty@example.com'));
}
/*
* When the source attribute doesn't have a scope, the entire value is used.
*/
public function testNoAt()
{
$config = array(
'scopeAttribute' => 'schacHomeOrganization',
'sourceAttribute' => 'eduPersonAffiliation',
'targetAttribute' => 'eduPersonScopedAffiliation',
);
$request = array(
'Attributes' => array(
'schacHomeOrganization' => array('example.org'),
'eduPersonAffiliation' => array('student'),
)
);
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
$this->assertEquals($attributes['eduPersonScopedAffiliation'], array('student@example.org'));
}
}
tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
+ 2
− 2
View file @ 1b867d20
...@@ -103,7 +103,7 @@ class Test_Core_Auth_Process_ScopeFromAttribute extends PHPUnit_Framework_TestCa ...@@ -103,7 +103,7 @@ class Test_Core_Auth_Process_ScopeFromAttribute extends PHPUnit_Framework_TestCa
* NOTE: currently disabled: this triggers a warning and a warning * NOTE: currently disabled: this triggers a warning and a warning
* wants to start a session which we cannot do in phpunit. How to fix? * wants to start a session which we cannot do in phpunit. How to fix?
*/ */
/* public function testNoAt() public function testNoAt()
{ {
$config = array( $config = array(
'sourceAttribute' => 'eduPersonPrincipalName', 'sourceAttribute' => 'eduPersonPrincipalName',
...@@ -118,5 +118,5 @@ class Test_Core_Auth_Process_ScopeFromAttribute extends PHPUnit_Framework_TestCa ...@@ -118,5 +118,5 @@ class Test_Core_Auth_Process_ScopeFromAttribute extends PHPUnit_Framework_TestCa
$attributes = $result['Attributes']; $attributes = $result['Attributes'];
$this->assertArrayNotHasKey('scope', $attributes); $this->assertArrayNotHasKey('scope', $attributes);
} */ }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment