summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMikaël Ates <mates@entrouvert.com>2011-10-21 16:52:04 (GMT)
committerMikaël Ates <mates@entrouvert.com>2011-10-21 16:52:04 (GMT)
commitd23bb1065e283719666dae362d23e651b81f0406 (patch)
treee70a8dc0a1879836b5eb34b10c4d6ed517897922 /doc
parent42a602d4837ffc79584c39c6ad1da03adf88dcaf (diff)
downloadauthentic-d23bb1065e283719666dae362d23e651b81f0406.zip
authentic-d23bb1065e283719666dae362d23e651b81f0406.tar.gz
authentic-d23bb1065e283719666dae362d23e651b81f0406.tar.bz2
[idp] Attribute policies can now be managed with global policies.
Diffstat (limited to 'doc')
-rw-r--r--doc/administration_with_policies.rst6
-rw-r--r--doc/attribute_management.rst5
-rw-r--r--doc/pictures/policy_pull.pngbin83727 -> 84283 bytes
-rw-r--r--doc/pictures/policy_pull_saved.pngbin33304 -> 33345 bytes
-rw-r--r--doc/pictures/sp_policy_pull.pngbin52560 -> 32218 bytes
5 files changed, 10 insertions, 1 deletions
diff --git a/doc/administration_with_policies.rst b/doc/administration_with_policies.rst
index b800153..b4dcbc4 100644
--- a/doc/administration_with_policies.rst
+++ b/doc/administration_with_policies.rst
@@ -20,16 +20,22 @@ global policies named 'Default' and 'All':
**A policy is taken in account only if it is enabled.**
+**When a regular policy is associated with an object, it is taken in account
+only if the option 'enable the following policy' is checked.**
+
::
def get_sample_policy(any_object):
+ # Look for a global policy 'All'
try:
return SamplePolicy.objects.get(name='All', enabled=True)
except SamplePolicy.DoesNotExist:
pass
+ # Look for a regular policy
if any_object.enable_following_sample_policy:
if any_object.sample_policy:
return any_object.sample_policy
+ # Look for a global policy 'Default'
try:
return SamplePolicy.objects.get(name='Default', enabled=True)
except SamplePolicy.DoesNotExist:
diff --git a/doc/attribute_management.rst b/doc/attribute_management.rst
index cc4a1f2..8efa26b 100644
--- a/doc/attribute_management.rst
+++ b/doc/attribute_management.rst
@@ -174,6 +174,9 @@ ______________________________________
Create or modify an attribute policy
____________________________________
+You can create a global policy 'All' or 'Default'. For details, see :ref:`administration_with_policies`.
+Or you can create a regular policy and associate it to a service provider.
+
1. Go to http[s]://your.domain.com/admin/idp/attributepolicy/add/
2. Add list to the policy
@@ -191,7 +194,7 @@ __________________________________________
1. Go to http[s]://your.domain.com/admin/saml/libertyprovider/1/
-2. Add policy to the service provider
+2. Associate the policy to the service provider and **enable it**
.. image:: pictures/sp_policy_pull.png
:width: 800 px
diff --git a/doc/pictures/policy_pull.png b/doc/pictures/policy_pull.png
index 67ae162..e3059e6 100644
--- a/doc/pictures/policy_pull.png
+++ b/doc/pictures/policy_pull.png
Binary files differ
diff --git a/doc/pictures/policy_pull_saved.png b/doc/pictures/policy_pull_saved.png
index bafaea7..d970d3c 100644
--- a/doc/pictures/policy_pull_saved.png
+++ b/doc/pictures/policy_pull_saved.png
Binary files differ
diff --git a/doc/pictures/sp_policy_pull.png b/doc/pictures/sp_policy_pull.png
index b361d06..43881a5 100644
--- a/doc/pictures/sp_policy_pull.png
+++ b/doc/pictures/sp_policy_pull.png
Binary files differ