From 57dac7c08f9db024f5dd4be28be388b9db517a90 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Fri, 20 Oct 2023 09:33:52 +0200
Subject: [PATCH] check "connect" before executing any action

---
 core/src/main/cfml/context/Admin.cfc | 8 ++++++--
 loader/build.xml                     | 2 +-
 loader/pom.xml                       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/cfml/context/Admin.cfc b/core/src/main/cfml/context/Admin.cfc
index f70582f6a0..7ba7a5b917 100644
--- a/core/src/main/cfml/context/Admin.cfc
+++ b/core/src/main/cfml/context/Admin.cfc
@@ -30,14 +30,18 @@
 		<cfargument name="password" required="yes" type="string">
 		<cfargument name="attributeCollection" required="yes" type="struct">
 		<cfargument name="callerId" required="no" type="string" default="undefined">
-		
+
 		<cfset var result="">
 		<cfset var id=getLuceeId()[arguments.type].id>
 		<cfset var sec=getLuceeId()[arguments.type].securityKey>
 		<cfif not listFind(arguments.callerId,id)>
+			<cfset var pw=Decrypt(arguments.password,sec)>
+			<cfadmin action="connect"
+				type="#arguments.type#"
+				password="#pw#">
 			<cfadmin 
 				type="#arguments.type#"
-				password="#Decrypt(arguments.password,sec)#"
+				password="#pw#"
 				attributeCollection="#arguments.attributeCollection#"
 				providedCallerIds="#arguments.callerId#"
 				returnVariable="result">
diff --git a/loader/build.xml b/loader/build.xml
index 3d5e4f7ed5..081b821d3e 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="5.4.4.21-SNAPSHOT"/>
+  <property name="version" value="5.4.4.22-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>
diff --git a/loader/pom.xml b/loader/pom.xml
index 7dfb54d260..cdada33c6f 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>5.4.4.21-SNAPSHOT</version>
+  <version>5.4.4.22-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>