From 153bce28331f54b2188df4fc940ec8c03d758875 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Thu, 28 Jul 2022 10:24:20 -0600
Subject: [PATCH] better ipv6 iscsi support

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 CHANGELOG.md        | 3 ++-
 src/driver/index.js | 7 +++++++
 src/utils/iscsi.js  | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ca78f7..744f0af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # v1.7.3
 
-Released 2022-07-17
+Released 2022-07-28
 
 - more stringent block device lookup logic (see #215)
+- ipv6 iscsi support
 - dependency bumps
 - minor fixes throughout
 
diff --git a/src/driver/index.js b/src/driver/index.js
index c3275a6..59ea6ee 100644
--- a/src/driver/index.js
+++ b/src/driver/index.js
@@ -781,6 +781,13 @@ class CsiBaseDriver {
                 iscsiConnection.portal
               );
 
+              if (!session) {
+                throw new GrpcError(
+                  grpc.status.UNKNOWN,
+                  `unable to find iscsi session for iqn: ${iscsiConnection.iqn}, portal: ${iscsiConnection.portal}`
+                );
+              }
+
               // rescan in scenarios when login previously occurred but volumes never appeared
               await iscsi.iscsiadm.rescanSession(session);
 
diff --git a/src/utils/iscsi.js b/src/utils/iscsi.js
index 7ead35e..7eb5291 100644
--- a/src/utils/iscsi.js
+++ b/src/utils/iscsi.js
@@ -214,6 +214,7 @@ class ISCSI {
         }
 
         // protocol: [id] ip:port,target_portal_group_tag targetname
+        // tcp: [111] [2001:123:456::1]:3260,1 iqn.2005-10.org.freenas.ctl:default-aptcacher-iscsi-claim (non-flash)
         const entries = result.stdout.trim().split("\n");
         const sessions = [];
         let fields;
@@ -222,7 +223,7 @@ class ISCSI {
           sessions.push({
             protocol: entry.split(":")[0],
             id: Number(fields[1].replace("[", "").replace("]", "")),
-            portal: fields[2].replace("[", "").replace("]", "").split(",")[0],
+            portal: fields[2].split(",")[0],
             target_portal_group_tag: fields[2].split(",")[1],
             iqn: fields[3].trim(),
             //iqn: fields[3].split(":")[0],