Decreased dependencies on non-OIM databases for people information.

git-svn-id: svn://t2.unl.edu/brian/GraphUsers/gratia@2782 1fda6f16-4416-0410-bfd6-867a04880151

setup/setup.py

@@ -48,7 +48,8 @@ setup(name="OSG-Measurements-Metrics",
 
       data_files=[('/etc/init.d', ['config/GratiaWeb']),
           ('/etc/', ['config/wlcg_email.conf.rpmnew',
-                     'config/DBParam.xml.rpmnew']),
+                     'config/DBParam.xml.rpmnew',
+                     'config/access.db']),
           ('/usr/share/GratiaWeb/', ['config/gip_schema',
                                      'config/registration_schema']),
           ('/etc/cron.d/', ['config/gratia_data.cron']),

src/gratia/config/generic_secure_queries.xml

@@ -65,7 +65,7 @@
       <attribute name="title" />
       <attribute name="column_names" />
       <attribute name="column_units" />
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">site_ownership</attribute>
       <attribute name="access">facility</attribute>
     </query>

src/gratia/config/gratia_graphs.xml

@@ -22,7 +22,7 @@
   <class type="Grapher" name="gratia_bar_grapher">
     <attribute name="display_name"> Bar Graphs </attribute>
 <!--
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">site_ownership</attribute>
       <attribute name="access">facility</attribute>
 -->
@@ -36,21 +36,21 @@
 
 
   <class type="Grapher" name="gratia_site_grapher">
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">site_ownership</attribute>
       <attribute name="access">facility</attribute>
       <queryobj> GratiaSiteBarQueries </queryobj>
   </class>
 
   <class type="Grapher" name="gratia_vo_grapher">
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">vo_ownership</attribute>
       <attribute name="access">vo</attribute>
       <queryobj> GratiaVoBarQueries </queryobj>
   </class>
 
   <class type="Grapher" name="gratia_user_grapher">
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">user_ownership</attribute>
       <attribute name="access">user</attribute>
       <queryobj> GratiaUserBarQueries </queryobj>

src/gratia/config/security.xml

@@ -142,6 +142,33 @@
 
         <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>
                 <input name="dn" kind="sql"> Unknown </input>

src/gratia/config/text_queries.xml

@@ -38,7 +38,7 @@
   </class>
 
   <class type="XmlGenerator" name="user_xml">
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">users</attribute>
       <attribute name="access">dn</attribute>
       <queryobj> GratiaUserBarQueries </queryobj>
@@ -65,7 +65,7 @@
   </class>
 
   <class type="CsvGenerator" name="query_csv_secure">
-      <attribute name="security">GratiaSecurity</attribute>
+      <attribute name="security">OIMSecurity</attribute>
       <attribute name="authtype">site_ownership</attribute>
       <attribute name="access">facility</attribute>
       <queryobj> RSVSecureQueries </queryobj>