From d17c25af2c24d3e939a9bf7967dcc76aaa926697 Mon Sep 17 00:00:00 2001
From: brian <brian@1fda6f16-4416-0410-bfd6-867a04880151>
Date: Wed, 28 Jan 2009 04:51:03 +0000
Subject: [PATCH] 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
---
access.db | Bin 0 -> 7168 bytes
config/GratiaWeb | 0
setup/setup.py | 3 ++-
src/gratia/config/generic_secure_queries.xml | 2 +-
src/gratia/config/gratia_graphs.xml | 8 +++---
src/gratia/config/security.xml | 27 +++++++++++++++++++
src/gratia/config/text_queries.xml | 4 +--
7 files changed, 36 insertions(+), 8 deletions(-)
create mode 100644 access.db
mode change 100644 => 100755 config/GratiaWeb
diff --git a/access.db b/access.db
new file mode 100644
index 0000000000000000000000000000000000000000..7830a9bad0f09bb393476192f973c5f2531bb526
GIT binary patch
literal 7168
zcmWFz^vNtqRY=P(%1ta$FlJz3U}R))P*7lCVBlnc044?o24*Oq5h4U8k=bAYTm&zZ
zBLg$za|UJ>rs<5&ArP0^QE{4tKm;3`xS~8`eP&)tYDI2pZc=JdaYklAn7=QC&F&oJ
z>KNjx5bEa{80xCv>F44ap@2}Qke{ajSF2H$ucMHXr=yUYn3<!=9LW$SE6Z40l9-f}
z8s_g`o|jrw45Qhg#)ddL`M4^;L=`m3@)gPwi;^=Ei!_W(O*KKrp$KSZv#^WH%QH5r
zLXCww6Yd69G=rh?giVIH8r8C3W_EFLamGeguw|jesYS(Lf(6AAu#kdANn%lYYDs)b
z9*P;5K44&ASgxoDGc-7}Boz`g2o^Jn@d$ARjbc!i#2-Km3=AIf@{F-yC;JDxJEr7j
z<`u&kOeki<g%vc=+^q>sZLmDf2IY@ZqaiRF0wW*<ctL(-0TH8kGz3ONV5Eh>X#O8*
zF+S?w(GWm{z-azQgvBUpGz3Ok2#n_ckrv~l{v8bgL<n$!n4|rFP$-Pz(GVDMApiiO
CJhFfQ
literal 0
HcmV?d00001
diff --git a/config/GratiaWeb b/config/GratiaWeb
old mode 100644
new mode 100755
diff --git a/setup/setup.py b/setup/setup.py
index c42bceb..4b3d091 100644
--- a/setup/setup.py
+++ b/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']),
diff --git a/src/gratia/config/generic_secure_queries.xml b/src/gratia/config/generic_secure_queries.xml
index 70eeeee..2562cd0 100644
--- a/src/gratia/config/generic_secure_queries.xml
+++ b/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>
diff --git a/src/gratia/config/gratia_graphs.xml b/src/gratia/config/gratia_graphs.xml
index c4aa0cb..62f1849 100644
--- a/src/gratia/config/gratia_graphs.xml
+++ b/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>
diff --git a/src/gratia/config/security.xml b/src/gratia/config/security.xml
index 366ba0f..e7117bc 100644
--- a/src/gratia/config/security.xml
+++ b/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>
diff --git a/src/gratia/config/text_queries.xml b/src/gratia/config/text_queries.xml
index 89f7e4e..c2c2031 100644
--- a/src/gratia/config/text_queries.xml
+++ b/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>
--
GitLab