From b406b78bdb91abb00582f2674a61fecd8deecd2f Mon Sep 17 00:00:00 2001
From: Albert Louis Rossi <arossi@fnal.gov>
Date: Mon, 24 Jul 2023 09:21:57 -0500
Subject: [PATCH] dcache-vehicles:  fix NPE in resolve symlink message

Motivation:

see GH ` looking at Open Issue access the dCache namespace via Frontend in 9.1.1` #7250

See also https://rb.dcache.org/r/14013/

Not handling paths that don't begin with slash.

Modification:

Treat `null` as `/` and prepend '/' to relative paths.

Result:

Correct behavior without NPE or index out of bounds errors.

Target: master
Request: 9.1
Request: 9.0
(not backported to 8.2)
Bug: #7250
Closes: #7250
Requires-notes: yes
Acked-by: Dmitry
---
 .../org/dcache/vehicles/PnfsResolveSymlinksMessage.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/PnfsResolveSymlinksMessage.java b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/PnfsResolveSymlinksMessage.java
index cc61105cda6..3a663432cd9 100644
--- a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/PnfsResolveSymlinksMessage.java
+++ b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/PnfsResolveSymlinksMessage.java
@@ -4,6 +4,7 @@
 
 package org.dcache.vehicles;
 
+import com.google.common.base.Strings;
 import diskCacheV111.vehicles.PnfsMessage;
 
 public class PnfsResolveSymlinksMessage extends PnfsMessage {
@@ -21,6 +22,11 @@ public PnfsResolveSymlinksMessage(String path) {
     }
 
     public PnfsResolveSymlinksMessage(String path, String prefix) {
+        if (Strings.emptyToNull(path) == null) {
+            path = "/";
+        } else if (path.charAt(0) != '/') {
+            path = "/" + path;
+        }
         setPnfsPath(path);
         this.prefix = prefix;
         setReplyRequired(true);