[_81] add test and handling of PEP for atomic acl

Author: d-w-moore

indexing.cmake

@@ -66,6 +66,7 @@ install(
   FILES
   ${CMAKE_SOURCE_DIR}/packaging/test_plugin_indexing.py
   ${CMAKE_SOURCE_DIR}/packaging/atomic_metadata_ops.py
+  ${CMAKE_SOURCE_DIR}/packaging/atomic_acl_ops.py
   DESTINATION ${IRODS_HOME_DIRECTORY}/scripts/irods/test
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   COMPONENT ${IRODS_PACKAGE_COMPONENT_POLICY_NAME}

libirods_rule_engine_plugin-indexing.cpp

@@ -518,6 +518,21 @@ namespace {
                     idx.schedule_metadata_purge_for_recursive_rm_object(obj_inp->collName, recurseInfo);
                 }
             }
+            else if("pep_api_atomic_apply_acl_operations_post" == _rn) {
+                    auto it = _args.begin();
+                    std::advance(it, 2);
+                    auto request = boost::any_cast<BytesBuf*>(*it);
+                    std::string requ_str {(const char*)request->buf,unsigned(request->len)};
+                    const auto requ_json = nlohmann::json::parse( requ_str );
+                    const auto obj_path = requ_json["logical_path"].get<std::string>();
+                    irods::indexing::indexer idx{_rei, config->instance_name_};
+                    idx.schedule_metadata_indexing_event(
+                        obj_path,
+                        _rei->rsComm->clientUser.userName,
+                        "attribute",
+                        "value",
+                        "units");
+            }
             else if (_rn == "pep_api_atomic_apply_metadata_operations_pre"
                   || _rn == "pep_api_atomic_apply_metadata_operations_post")
             {
@@ -1022,6 +1037,7 @@ irods::error rule_exists(
                                     "pep_api_data_obj_unlink_post",
                                     "pep_api_mod_avu_metadata_pre",
                                     "pep_api_mod_avu_metadata_post",
+                                    "pep_api_atomic_apply_acl_operations_post",
                                     "pep_api_data_obj_close_post",
                                     "pep_api_data_obj_put_post",
                                     "pep_api_phy_path_reg_post",

packaging/atomic_acl_ops.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+from __future__ import print_function
+import sys
+import json
+import getopt
+from os.path import (join, abspath)
+
+opt,args = getopt.getopt(sys.argv[1:],'v:')
+optD = dict(opt)
+activate_path = optD.get('-v')
+if activate_path is not None:
+    if '/bin/activate' not in activate_path:
+        activate_path = join(activate_path, 'bin/activate_this.py')
+    activate_path = abspath( activate_path )
+    exec(open(activate_path).read(), {'__file__': activate_path})
+
+from irods.message import iRODSMessage, JSON_Message
+from irods.test.helpers import  (home_collection, make_session)
+
+def call_json_api(sess, request_text, api_number):
+    with sess.pool.get_connection() as conn:
+        request_msg = iRODSMessage("RODS_API_REQ",  JSON_Message( request_text, conn.server_version ), int_info=api_number)
+        conn.send( request_msg )
+        response = conn.recv()
+    response_msg = response.get_json_encoded_struct()
+    if response_msg:
+        print("in atomic apply ACL api, server responded with: %r"%response_msg, file = sys.stderr)
+
+
+def usage(program = sys.argv[0], stream = sys.stderr):
+    print('{program} logical_path [user1 access1] [user2 access2] ... '.format(**locals()), file = stream)
+    exit(1)
+
+if __name__ == '__main__':
+
+    try:
+        logical_path = args.pop(0)
+    except IndexError:
+        usage()
+
+    request = {"logical_path": logical_path,
+            "operations": [ ]
+           }
+
+    with make_session() as ses:
+        while len(args) > 0:
+            try:
+                username,access = args[:2]
+            except ValueError:
+                usage()
+            del args[:2]
+            request["operations"].append({"entity_name": username,
+                                          "acl": access             })
+        call_json_api(ses, request, api_number = 20005) # ATOMIC_APPLY_ACL_OPERATIONS_APN
+

packaging/atomic_metadata_ops.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import re

packaging/test_plugin_indexing.py

@@ -11,7 +11,7 @@
 
 import zipfile
 import subprocess
-from time import sleep
+from time import sleep, time
 from textwrap import dedent
 from datetime import datetime as _datetime
 
@@ -932,6 +932,31 @@ def logical_filesystem_for_indexing(self,objects,session):
             for p in collections_to_delete:
                 session.assert_icommand(['irm', '-rf', p],'STDOUT','')
 
+    def test_indexing_with_atomic_acl_ops__81(self):
+        with indexing_plugin__installed(indexing_config = {'minimum_delay_time':'1', 'maximum_delay_time':'9'}):
+            test_coll = self.test_coll_name()
+            INDEX = DEFAULT_METADATA_INDEX + "__81_{:%s.%f}".format(_datetime.now())
+            create_metadata_index (INDEX)
+            try:
+                with session.make_session_for_existing_admin() as admin_session:
+                    admin_session.assert_icommand("imkdir {0}".format(test_coll))
+                    admin_session.assert_icommand("itouch {0}/testobj".format(test_coll))
+                    admin_session.assert_icommand("imeta set -C {0} irods::indexing::index {1}::metadata elasticsearch".format(test_coll, INDEX))
+                    sleep(5)
+                    # hit the apply_atomic_acl api
+                    self.assertIsNotNone (repeat_until (operator.eq, True) (self.delay_queue_is_empty) (admin_session))
+                    admin_session.assert_icommand("""cd ${{HOME}} ;  python3 ~/scripts/irods/test/atomic_acl_ops.py -v {self.venv_dir} """
+                                                  """ '/{0.zone_name}/home/{0.username}'/{test_coll}/testobj {self.user0.username} write """
+                                                  """ {self.user1.username} read """.format(admin_session, **locals()), use_unsafe_shell=True)
+                    # Check new permissions are reflected in the index
+                    self.assertIsNotNone( repeat_until(operator.eq, 1, transform=number_of_hits,
+                                                      ) (search_index_for_userPermissions_user_name) (INDEX, self.user0.username))
+                    self.assertEqual(1, number_of_hits(search_index_for_userPermissions_user_name (INDEX, self.user1.username)))
+            finally:
+                delete_metadata_index (INDEX)
+                with session.make_session_for_existing_admin() as admin_session:
+                    admin_session.assert_icommand("irm -fr {0}".format(test_coll))
+
     def test_indexing_with_atomic_metadata_ops_66(self):
         with indexing_plugin__installed():
             test_coll = 'testcoll_66'