From 6cde7382fc271173c03f592325801c569e54eb4b Mon Sep 17 00:00:00 2001
From: Lazlo Westerhof <l.r.westerhof@uu.nl>
Date: Wed, 8 May 2024 09:31:42 +0200
Subject: [PATCH] msi_dir_list: check if the hostname and resource location are
 the same

---
 src/msi_dir_list.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/msi_dir_list.cpp b/src/msi_dir_list.cpp
index 62cac3f..f611659 100644
--- a/src/msi_dir_list.cpp
+++ b/src/msi_dir_list.cpp
@@ -68,7 +68,7 @@ static int get_resource_attribute_by_name(rsComm_t* rsComm,
         else {
             if ((resource_data = getSqlResultByInx(genQueryOut, column_number)) == NULL) {
                 rodsLog(LOG_ERROR,
-                        "msi_file_checksum: getSqlResultByInx for column %d failed on lookup of %s",
+                        "msi_dir_list: getSqlResultByInx for column %d failed on lookup of %s",
                         column_number,
                         resource_name);
                 out_status = UNMATCHED_KEY_OR_INDEX;
@@ -105,6 +105,14 @@ static int get_resource_vault_path(rsComm_t* rsComm, char* resource_name, char*
     return get_resource_attribute_by_name(rsComm, resource_name, resource_vault_path_out, COL_R_VAULT_PATH);
 }
 
+/** This function retrieves the location of a resource based on its name
+ *  to resource_loc_out
+ */
+static int get_resource_loc(rsComm_t* rsComm, char* resource_name, char* resource_loc_out)
+{
+    return get_resource_attribute_by_name(rsComm, resource_name, resource_loc_out, COL_R_LOC);
+}
+
 int msiDirList(msParam_t* _path, msParam_t* _rescName, msParam_t* _list, ruleExecInfo_t* _rei)
 {
     // Convert parameter values to C strings.
@@ -182,6 +190,24 @@ int msiDirList(msParam_t* _path, msParam_t* _rescName, msParam_t* _list, ruleExe
         return SYS_INVALID_FILE_PATH;
     }
 
+    // Retrieve resource location
+    char resource_loc[MAX_NAME_LEN + 1];
+    memset(&resource_loc, '\0', MAX_NAME_LEN + 1);
+    int status_resource_loc = get_resource_loc(_rei->rsComm, rescName, resource_loc);
+    if (status_resource_loc < 0) {
+        rodsLog(LOG_ERROR,
+                "msi_dir_list: error while looking up resource vault path of resource [%s]: %d",
+                rescName,
+                status_resource_loc);
+        return status_resource_loc;
+    }
+
+    // Check if the hostname and resource location are the same.
+    if (strcmp(_rei->rsComm->myEnv.rodsHost, resource_loc) != 0) {
+        rodsLog(LOG_ERROR, "msi_dir_list: hostname differs from resource location");
+        return USER_INVALID_RESC_INPUT;
+    }
+
     try {
         pt::ptree jsonResult;
         fs::directory_iterator endIter;