Skip to content

Commit aac34b9

Browse files
brusdevbrusdev
committed
[arkmq-org#1082] Fix jolokia illegal paths
Since Apache ActiveMQ Artemis 2.39.0 the chat " in the path of the jolokia requests cause: Error 400 Suspicious Path Character, Illegal Path Character
1 parent 8a3b04b commit aac34b9

6 files changed

+28
-28
lines changed

‎controllers/activemqartemis_controller_cert_manager_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ var _ = Describe("artemis controller with cert manager test", Label("controller-
10951095
})
10961096

10971097
func getConnectorConfig(podName string, crName string, connectorName string, g Gomega) map[string]string {
1098-
curlUrl := "http://" + podName + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/ConnectorsAsJSON"
1098+
curlUrl := "http://" + podName + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/ConnectorsAsJSON"
10991099
command := []string{"curl", "-k", "-s", "-u", "testuser:testpassword", curlUrl}
11001100

11011101
result := ExecOnPod(podName, crName, defaultNamespace, command, g)
@@ -1119,7 +1119,7 @@ func getConnectorConfig(podName string, crName string, connectorName string, g G
11191119
}
11201120

11211121
func CheckAcceptorStarted(podName string, crName string, acceptorName string, g Gomega) {
1122-
curlUrl := "http://" + podName + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\",component=acceptors,name=\"" + acceptorName + "\"/Started"
1122+
curlUrl := "http://" + podName + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22,component=acceptors,name=%22" + acceptorName + "%22/Started"
11231123
command := []string{"curl", "-k", "-s", "-u", "testuser:testpassword", curlUrl}
11241124

11251125
result := ExecOnPod(podName, crName, defaultNamespace, command, g)

‎controllers/activemqartemis_controller_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -10050,7 +10050,7 @@ var _ = Describe("artemis controller", func() {
1005010050
By("checking pod 0 status that has properties applied")
1005110051
podWithOrdinal0 := namer.CrToSS(crd.Name) + "-0"
1005210052

10053-
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/Status"
10053+
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/Status"
1005410054
curlCmd := []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1005510055
Eventually(func(g Gomega) {
1005610056
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)
@@ -10061,7 +10061,7 @@ var _ = Describe("artemis controller", func() {
1006110061
g.Expect(*result).NotTo(ContainSubstring("broker-1.globalMem.properties"))
1006210062
}, existingClusterTimeout, existingClusterInterval).Should(Succeed())
1006310063

10064-
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/GlobalMaxSize"
10064+
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/GlobalMaxSize"
1006510065
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1006610066
Eventually(func(g Gomega) {
1006710067
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)
@@ -10073,7 +10073,7 @@ var _ = Describe("artemis controller", func() {
1007310073
By("checking pod 1 status that has properties applied")
1007410074
podWithOrdinal1 := namer.CrToSS(crd.Name) + "-1"
1007510075

10076-
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/Status"
10076+
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/Status"
1007710077
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1007810078
Eventually(func(g Gomega) {
1007910079
result, err := RunCommandInPod(podWithOrdinal1, crd.Name+"-container", curlCmd)
@@ -10084,7 +10084,7 @@ var _ = Describe("artemis controller", func() {
1008410084
g.Expect(*result).NotTo(ContainSubstring("broker-0.globalMem.properties"))
1008510085
}, existingClusterTimeout, existingClusterInterval).Should(Succeed())
1008610086

10087-
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/GlobalMaxSize"
10087+
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/GlobalMaxSize"
1008810088
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1008910089
Eventually(func(g Gomega) {
1009010090
result, err := RunCommandInPod(podWithOrdinal1, crd.Name+"-container", curlCmd)
@@ -10155,7 +10155,7 @@ var _ = Describe("artemis controller", func() {
1015510155
By("checking pod 0 status that has properties applied")
1015610156
podWithOrdinal0 := namer.CrToSS(crd.Name) + "-0"
1015710157

10158-
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/Status"
10158+
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/Status"
1015910159
curlCmd := []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1016010160
Eventually(func(g Gomega) {
1016110161
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)
@@ -10166,7 +10166,7 @@ var _ = Describe("artemis controller", func() {
1016610166
g.Expect(*result).NotTo(ContainSubstring("broker-1.globalMem.json"))
1016710167
}, existingClusterTimeout, existingClusterInterval).Should(Succeed())
1016810168

10169-
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/GlobalMaxSize"
10169+
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/GlobalMaxSize"
1017010170
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1017110171
Eventually(func(g Gomega) {
1017210172
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)
@@ -10178,7 +10178,7 @@ var _ = Describe("artemis controller", func() {
1017810178
By("checking pod 1 status that has properties applied")
1017910179
podWithOrdinal1 := namer.CrToSS(crd.Name) + "-1"
1018010180

10181-
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/Status"
10181+
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/Status"
1018210182
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1018310183
Eventually(func(g Gomega) {
1018410184
result, err := RunCommandInPod(podWithOrdinal1, crd.Name+"-container", curlCmd)
@@ -10189,7 +10189,7 @@ var _ = Describe("artemis controller", func() {
1018910189
g.Expect(*result).NotTo(ContainSubstring("broker-0.globalMem.json"))
1019010190
}, existingClusterTimeout, existingClusterInterval).Should(Succeed())
1019110191

10192-
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\"/GlobalMaxSize"
10192+
curlUrl = "http://" + podWithOrdinal1 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22/GlobalMaxSize"
1019310193
curlCmd = []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
1019410194
Eventually(func(g Gomega) {
1019510195
result, err := RunCommandInPod(podWithOrdinal1, crd.Name+"-container", curlCmd)

‎controllers/activemqartemisscaledown_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ var _ = Describe("Scale down controller", func() {
125125
// so the pod number will change from 1 to 2 and back to 1.
126126
// checking message count on broker 0 to make sure scale down finally happens.
127127
By("Checking messsage count on broker 0")
128-
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=\"amq-broker\",component=addresses,address=\"DLQ\",subcomponent=queues,routing-type=\"anycast\",queue=\"DLQ\"/MessageCount"
128+
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:broker=%22amq-broker%22,component=addresses,address=%22DLQ%22,subcomponent=queues,routing-type=%22anycast%22,queue=%22DLQ%22/MessageCount"
129129
curlCmd := []string{"curl", "-s", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
130130
result, err := RunCommandInPod(podWithOrdinal0, brokerName+"-container", curlCmd)
131131
g.Expect(err).To(BeNil())

‎controllers/activemqartemissecurity_broker_properties_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ var _ = Describe("security without controller", func() {
183183
By("verify joe cannot see address message count attribute")
184184
podWithOrdinal0 := namer.CrToSS(crd.Name) + "-0"
185185
originHeader := "Origin: http://" + "localhost" // value not verified but presence necessary
186-
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:address=\"TOMS_WORK_QUEUE\",broker=\"amq-broker\",component=addresses/MessageCount"
186+
curlUrl := "http://" + podWithOrdinal0 + ":8161/console/jolokia/read/org.apache.activemq.artemis:address=%22TOMS_WORK_QUEUE%22,broker=%22amq-broker%22,component=addresses/MessageCount"
187187
curlCmd := []string{"curl", "-S", "-v", "-H", originHeader, "-u", "joe:joe", curlUrl}
188188
Eventually(func(g Gomega) {
189189
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)
@@ -206,7 +206,7 @@ var _ = Describe("security without controller", func() {
206206
}, existingClusterTimeout, existingClusterInterval).Should(Succeed())
207207

208208
By("verify admin can't call forceFailover")
209-
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/exec/org.apache.activemq.artemis:broker=\"amq-broker\"/forceFailover"
209+
curlUrl = "http://" + podWithOrdinal0 + ":8161/console/jolokia/exec/org.apache.activemq.artemis:broker=%22amq-broker%22/forceFailover"
210210
curlCmd = []string{"curl", "-S", "-v", "-H", originHeader, "-u", "admin:admin", curlUrl}
211211
Eventually(func(g Gomega) {
212212
result, err := RunCommandInPod(podWithOrdinal0, crd.Name+"-container", curlCmd)

‎controllers/controllermanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ var _ = Describe("tests regarding controller manager", func() {
165165
k8sClient.Update(ctx, createdCr)
166166
g.Expect(len(createdCr.Status.PodStatus.Ready)).Should(BeEquivalentTo(1))
167167
By("Checking messsage count on broker 0")
168-
curlUrl := "http://" + podWithOrdinal + ":8161/console/jolokia/read/org.apache.activemq.artemis:address=\"TEST\",broker=\"amq-broker\",component=addresses,queue=\"TEST\",routing-type=\"anycast\",subcomponent=queues/MessageCount"
168+
curlUrl := "http://" + podWithOrdinal + ":8161/console/jolokia/read/org.apache.activemq.artemis:address=%22TEST%22,broker=%22amq-broker%22,component=addresses,queue=%22TEST%22,routing-type=%22anycast%22,subcomponent=queues/MessageCount"
169169
queryCmd := []string{"curl", "-k", "-H", "Origin: http://localhost:8161", "-u", "user:password", curlUrl}
170170
reply, err := RunCommandInPodWithNamespace(podWithOrdinal, restrictedNamespace, createdCr.Name+"-container", queryCmd)
171171
g.Expect(err).To(BeNil())

‎pkg/utils/artemis/artemis.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ func (artemis *Artemis) GetStatus() (string, error) {
9999

100100
func (artemis *Artemis) CreateQueue(addressName string, queueName string, routingType string) (*jolokia.ResponseData, error) {
101101

102-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
102+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
103103
routingType = strings.ToUpper(routingType)
104104
parameters := `"` + addressName + `","` + queueName + `",` + `"` + routingType + `"`
105-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"createQueue(java.lang.String,java.lang.String,java.lang.String)","arguments":[` + parameters + `]` + ` }`
105+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"createQueue(java.lang.String,java.lang.String,java.lang.String)","arguments":[` + parameters + `]` + ` }`
106106
data, err := artemis.jolokia.Exec(url, jsonStr)
107107

108108
return data, err
109109
}
110110

111111
func (artemis *Artemis) UpdateQueue(queueConfig string) (*jolokia.ResponseData, error) {
112-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
112+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
113113
parameters := queueConfig
114-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"updateQueue(java.lang.String)","arguments":[` + parameters + `]` + ` }`
114+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"updateQueue(java.lang.String)","arguments":[` + parameters + `]` + ` }`
115115

116116
data, err := artemis.jolokia.Exec(url, jsonStr)
117117

@@ -126,9 +126,9 @@ func (artemis *Artemis) CreateQueueFromConfig(queueConfig string, ignoreIfExists
126126
} else {
127127
ignoreIfExistsValue = "false"
128128
}
129-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
129+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
130130
parameters := queueConfig + `,` + ignoreIfExistsValue
131-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"createQueue(java.lang.String,boolean)","arguments":[` + parameters + `]` + ` }`
131+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"createQueue(java.lang.String,boolean)","arguments":[` + parameters + `]` + ` }`
132132

133133
data, err := artemis.jolokia.Exec(url, jsonStr)
134134

@@ -137,40 +137,40 @@ func (artemis *Artemis) CreateQueueFromConfig(queueConfig string, ignoreIfExists
137137

138138
func (artemis *Artemis) CreateAddress(addressName string, routingType string) (*jolokia.ResponseData, error) {
139139

140-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
140+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
141141
routingType = strings.ToUpper(routingType)
142142
parameters := `"` + addressName + `","` + routingType + `"`
143-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"createAddress(java.lang.String,java.lang.String)","arguments":[` + parameters + `]` + ` }`
143+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"createAddress(java.lang.String,java.lang.String)","arguments":[` + parameters + `]` + ` }`
144144
data, err := artemis.jolokia.Exec(url, jsonStr)
145145

146146
return data, err
147147
}
148148

149149
func (artemis *Artemis) DeleteQueue(queueName string) (*jolokia.ResponseData, error) {
150150

151-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
151+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
152152
parameters := `"` + queueName + `"`
153-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"destroyQueue(java.lang.String)","arguments":[` + parameters + `]` + ` }`
153+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"destroyQueue(java.lang.String)","arguments":[` + parameters + `]` + ` }`
154154
data, err := artemis.jolokia.Exec(url, jsonStr)
155155

156156
return data, err
157157
}
158158

159159
func (artemis *Artemis) ListBindingsForAddress(addressName string) (*jolokia.ResponseData, error) {
160160

161-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
161+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
162162
parameters := `"` + addressName + `"`
163-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"listBindingsForAddress(java.lang.String)","arguments":[` + parameters + `]` + ` }`
163+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"listBindingsForAddress(java.lang.String)","arguments":[` + parameters + `]` + ` }`
164164
data, err := artemis.jolokia.Exec(url, jsonStr)
165165

166166
return data, err
167167
}
168168

169169
func (artemis *Artemis) DeleteAddress(addressName string) (*jolokia.ResponseData, error) {
170170

171-
url := "org.apache.activemq.artemis:broker=\\\"" + artemis.name + "\\\""
171+
url := "org.apache.activemq.artemis:broker=\"" + artemis.name + "\""
172172
parameters := `"` + addressName + `"`
173-
jsonStr := `{ "type":"EXEC","mbean":"` + url + `","operation":"deleteAddress(java.lang.String)","arguments":[` + parameters + `]` + ` }`
173+
jsonStr := `{ "type":"EXEC","mbean":"` + strings.Replace(url, "\"", "\\\"", -1) + `","operation":"deleteAddress(java.lang.String)","arguments":[` + parameters + `]` + ` }`
174174
data, err := artemis.jolokia.Exec(url, jsonStr)
175175

176176
return data, err

0 commit comments

Comments
 (0)