Changeset 2782

Timestamp:

01/27/2009 10:51:03 PM (10 months ago)

Author:

brian

Message:

Decreased dependencies on non-OIM databases for people information.

Files:

• GraphUsers/gratia/access.db (added)
• GraphUsers/gratia/config/GratiaWeb (modified) (1 prop)
• GraphUsers/gratia/setup/setup.py (modified) (1 diff)
• GraphUsers/gratia/src/gratia/config/generic_secure_queries.xml (modified) (1 diff)
• GraphUsers/gratia/src/gratia/config/gratia_graphs.xml (modified) (4 diffs)
• GraphUsers/gratia/src/gratia/config/security.xml (modified) (1 diff)
• GraphUsers/gratia/src/gratia/config/text_queries.xml (modified) (2 diffs)

GraphUsers/gratia/setup/setup.py

@@ -49 +49 @@
-      data_files=[('/etc/init.d', ['config/GratiaWeb']),
-          ('/etc/', ['config/wlcg_email.conf.rpmnew',
-
+
+
-          ('/usr/share/GratiaWeb/', ['config/gip_schema',
-                                     'config/registration_schema']),

GraphUsers/gratia/src/gratia/config/generic_secure_queries.xml

@@ -66 +66 @@
-      <attribute name="column_names" />
-      <attribute name="column_units" />
-Gratia
+OIM
-      <attribute name="authtype">site_ownership</attribute>
-      <attribute name="access">facility</attribute>

GraphUsers/gratia/src/gratia/config/gratia_graphs.xml

@@ -23 +23 @@
-    <attribute name="display_name"> Bar Graphs </attribute>
-<!--
-Gratia
+OIM
-      <attribute name="authtype">site_ownership</attribute>
-      <attribute name="access">facility</attribute>
@@ -37 +37 @@
-
-  <class type="Grapher" name="gratia_site_grapher">
-Gratia
+OIM
-      <attribute name="authtype">site_ownership</attribute>
-      <attribute name="access">facility</attribute>
@@ -44 +44 @@
-
-  <class type="Grapher" name="gratia_vo_grapher">
-Gratia
+OIM
-      <attribute name="authtype">vo_ownership</attribute>
-      <attribute name="access">vo</attribute>
@@ -51 +51 @@
-
-  <class type="Grapher" name="gratia_user_grapher">
-Gratia
+OIM
-      <attribute name="authtype">user_ownership</attribute>
-      <attribute name="access">user</attribute>

GraphUsers/gratia/src/gratia/config/security.xml

@@ -143 +143 @@
-        <attribute name="connection_manager"> RSVConnMan </attribute>
-
+        <query name="users">
+            <inputs>
+                <input name="dn" kind="sql"> Unknown </input>
+                <input name="access" kind="sql"> Unknown </input>
+            </inputs>
+            <sql>
+                SELECT
+                    IF(:access=:dn, 1, 0)
+            </sql>
+            <results function="security_parser" />
+        </query>
+
+        <query name="list_users">
+            <inputs>
+                <input name="dn" kind="sql"> Unknown </input>
+                <input name="access" kind="sql"> Unknown </input>
+            </inputs>
+            <sql>
+                SELECT
+                    dn
+                FROM (SELECT :dn as "dn") as foo
+                WHERE 
+                    dn=:access
+            </sql>
+            <results function="role_list" />
+        </query>
+
-        <query name="site_ownership">
-            <inputs>

GraphUsers/gratia/src/gratia/config/text_queries.xml

@@ -39 +39 @@
-
-  <class type="XmlGenerator" name="user_xml">
-Gratia
+OIM
-      <attribute name="authtype">users</attribute>
-      <attribute name="access">dn</attribute>
@@ -66 +66 @@
-
-  <class type="CsvGenerator" name="query_csv_secure">
-Gratia
+OIM
-      <attribute name="authtype">site_ownership</attribute>
-      <attribute name="access">facility</attribute>