From 1716eebaf2cf1ceeb4233b75e627d627b63c821a Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Tue, 21 Nov 2023 15:08:06 -0500 Subject: [PATCH 1/3] [#193,#196] Use -cacerts and rename alias to "nfsrods". --- start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start.sh b/start.sh index aefebe9c..f8a8c675 100644 --- a/start.sh +++ b/start.sh @@ -5,10 +5,10 @@ if [ "$1" != "sha" ]; then if [ -f /nfsrods_ssl.crt ]; then echo "Cert found for NFSRODS" set +e - keytool -delete -noprompt -alias mycert -keystore /etc/ssl/certs/java/cacerts -storepass changeit + keytool -delete -noprompt -alias nfsrods -cacerts -storepass changeit set -e echo "Importing cert to OpenJDK keystore" - keytool -import -trustcacerts -keystore /etc/ssl/certs/java/cacerts -storepass changeit -noprompt -alias mycert -file /nfsrods_ssl.crt + keytool -import -trustcacerts -cacerts -storepass changeit -noprompt -alias nfsrods -file /nfsrods_ssl.crt echo "Done" else echo "Cert not found for NFSRODS - not importing" From 493054b6b99aa26fc03697c9d6ac8e705833d41f Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Tue, 21 Nov 2023 15:09:28 -0500 Subject: [PATCH 2/3] [#198] Change base OS of Docker image to Ubuntu 22.04. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c67ed04..7635caf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 ARG sssd=false From 9a375a2dc884084545b32953a476fa2a57f7a607 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Tue, 21 Nov 2023 15:10:10 -0500 Subject: [PATCH 3/3] [#197] Assign cached inode number to local variable for list operation. --- .../java/org/irods/nfsrods/vfs/IRODSVirtualFileSystem.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/irods-vfs-impl/src/main/java/org/irods/nfsrods/vfs/IRODSVirtualFileSystem.java b/irods-vfs-impl/src/main/java/org/irods/nfsrods/vfs/IRODSVirtualFileSystem.java index 89453760..a585069b 100644 --- a/irods-vfs-impl/src/main/java/org/irods/nfsrods/vfs/IRODSVirtualFileSystem.java +++ b/irods-vfs-impl/src/main/java/org/irods/nfsrods/vfs/IRODSVirtualFileSystem.java @@ -1025,7 +1025,8 @@ public DirectoryStream list(Inode _inode, byte[] _verifier, long _cookie) throws if (null == inodeNumber) { - inodeToPathMapper_.map((long) e.getId(), path); + inodeNumber = (long) e.getId(); + inodeToPathMapper_.map(inodeNumber, path); } Stat stat = statPath(path, inodeNumber, e, groupsContainingUser);