From 7bd777af1d3045196f4b2b99587629d0979217b0 Mon Sep 17 00:00:00 2001
From: Ethan Kromhout <ethan@unc.edu>
Date: Thu, 7 Jan 2021 13:02:55 -0500
Subject: [PATCH] Wordpress rest fixes

---
 .../wordpress/httpd/shib.conf                 |  4 +++
 .../100-connector-rest-wordpress.xml          |  6 ++--
 .../roles/300-direct-wordpress-role-admin.xml |  2 +-
 .../tasks/996-task-import-sis-persons.xml     | 34 -------------------
 .../container_files/wordpress/sed.sh          |  2 +-
 5 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/996-task-import-sis-persons.xml

diff --git a/Workbench/configs-and-secrets/wordpress/httpd/shib.conf b/Workbench/configs-and-secrets/wordpress/httpd/shib.conf
index a4dcf57..093c5d6 100644
--- a/Workbench/configs-and-secrets/wordpress/httpd/shib.conf
+++ b/Workbench/configs-and-secrets/wordpress/httpd/shib.conf
@@ -52,6 +52,10 @@ ShibCompatValidUser Off
   ShibRequestSetting requireSession 1
   require shib-session
 </Location>
+<Location /wordpress/wp-json>
+ AuthType None
+  ShibRequestSetting requireSession 0
+</Location>
 
 <Location />
   AuthType shibboleth
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml
index 1857d2f..80ac37a 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml
@@ -108,13 +108,13 @@
     </connectorRef>
     <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
         <icfc:configurationProperties xmlns:gen774="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-rest-wordpress/edu.unc.polygon.connector.wordpress.WordpressRestConnector">
-            <gen774:wordpressPassword>54y6RxN7GfC7aes3</gen774:wordpressPassword>
+            <gen774:wordpressPassword>password</gen774:wordpressPassword>
             <gen774:trustAllCertificates>true</gen774:trustAllCertificates>
             <gen774:wordpressUniqueAttribute>id</gen774:wordpressUniqueAttribute>
-            <gen774:wordpressRestUrl>http://wordpress_server/wp-json</gen774:wordpressRestUrl>
+            <gen774:wordpressRestUrl>http://wordpress_server/wordpress/wp-json</gen774:wordpressRestUrl>
             <gen774:wordpressPasswordAttribute>password</gen774:wordpressPasswordAttribute>
             <gen774:wordpressNameAttribute>username</gen774:wordpressNameAttribute>
-            <gen774:wordpressUsername>admin</gen774:wordpressUsername>
+            <gen774:wordpressUsername>banderson</gen774:wordpressUsername>
             <gen774:wordpressRecyclebinUser>1</gen774:wordpressRecyclebinUser>
             <gen774:wordpressSoftUserDelete>true</gen774:wordpressSoftUserDelete>
         </icfc:configurationProperties>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/300-direct-wordpress-role-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/300-direct-wordpress-role-admin.xml
index c746e1d..a0c0b16 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/300-direct-wordpress-role-admin.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/300-direct-wordpress-role-admin.xml
@@ -52,7 +52,7 @@
                         <c:path>$containingObject/name</c:path>
                     </source>
                     <expression>
-                        <value>admin</value>
+                        <value>administrator</value>
                     </expression>
                 </outbound>
             </attribute>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/996-task-import-sis-persons.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/996-task-import-sis-persons.xml
deleted file mode 100644
index 58189c0..0000000
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/996-task-import-sis-persons.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-      oid="22c2a3d0-0961-4255-9eec-c550a79aeaaa">
-   <name>Import from SIS persons</name>
-   <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:type="c:ExtensionType">
-      <mext:kind>account</mext:kind>
-      <mext:objectclass>ri:AccountObjectClass</mext:objectclass>
-<!--
-      <mext:tracing>
-          <interval>500</interval>
-      </mext:tracing> -->
-   </extension>
-   <assignment>
-      <targetRef oid="00000000-0000-0000-0000-000000000503" type="ArchetypeType" /> <!--Import task-->
-   </assignment>
-   <taskIdentifier>1535407239440-0-1</taskIdentifier>
-   <ownerRef oid="00000000-0000-0000-0000-000000000002"
-             relation="org:default"
-             type="c:UserType"><!-- administrator --></ownerRef>
-   <executionStatus>runnable</executionStatus>
-   <category>ImportingAccounts</category>
-   <objectRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15"
-              relation="org:default"
-              type="c:ResourceType"><!-- SQL SIS persons (sources) --></objectRef>
-   <recurrence>single</recurrence>
-   <binding>loose</binding>
-</task>
diff --git a/Workbench/wordpress_server/container_files/wordpress/sed.sh b/Workbench/wordpress_server/container_files/wordpress/sed.sh
index 32db485..306f6ae 100755
--- a/Workbench/wordpress_server/container_files/wordpress/sed.sh
+++ b/Workbench/wordpress_server/container_files/wordpress/sed.sh
@@ -7,7 +7,7 @@ mkdir /var/www/html/wordpress
 mv /var/www/html/* /var/www/html/wordpress/
 mv /var/www/html/.htaccess /var/www/html/wordpress/
 sed -i "s/define( 'DB_COLLATE', '' );/define( 'DB_COLLATE', '' );\ndefine('JWT_AUTH_SECRET_KEY', 'your-top-secret-key');\ndefine('JWT_AUTH_CORS_ENABLE', true);\ndefine( 'WP_HOME', 'https:\/\/__CSPHOSTNAME__\/wordpress\/' );\ndefine( 'WP_SITEURL', 'https:\/\/__CSPHOSTNAME__\/wordpress\/' );\n/" /var/www/html/wordpress/wp-config.php
-sed -i "s/RewriteBase \//RewriteBase \/\nRewriteRule \^wp-json\/\(\.\*\) \/?rest_route=\/\$1 \[L\]\n/" /var/www/html/wordpress/.htaccess
+sed -i "s/RewriteBase \//RewriteBase \/wordpress\/\nRewriteRule \^wp-json\/\(\.\*\) \/wordpress\/?rest_route=\/\$1 \[L\]\n/" /var/www/html/wordpress/.htaccess
 sed -i 's/RewriteRule \. \/index\.php \[L\]/RewriteCond %{REQUEST_URI} !\\\.sso\/\nRewriteRule \. \/index\.php \[L\]/' /var/www/html/wordpress/.htaccess
 sed -i 's/AllowOverride None/AllowOverride All/'  /etc/httpd/conf/httpd.conf
 sed -i 's/IncludeOptional conf.d\/\*.conf/IncludeOptional conf.d\/\*.conf\nHttpProtocolOptions Unsafe/' /etc/httpd/conf/httpd.conf