Skip to content

fixed: 修正ingress search 页面中url检验脚本错误和service，pod之间的连接线脚本错误 #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixed: 修正ingress search 页面中url检验脚本错误和service，pod之间的连接线脚本错误 #299

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21663c7
fixed: 修正ingress search 页面中url检验脚本错误和service，pod之间的连接线脚本错误
awol2005ex Jan 23, 2025
bfdbff0
ingress search 匹配url bug修改
awol2005ex Feb 5, 2025
1e8f2d3
ingress search 匹配url bug修改
awol2005ex Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 54 additions & 16 deletions web/dashboard/src/business/network/ingresses/ingress-search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ export default {
var map = {}
var result = []
lines.forEach(m => {
if (!map[m.targte + "-" + m.source]) {
if (!map[m.target + "-" + m.source]) {
result.push(m)
map[m.targte + "-" + m.source] = true
map[m.target + "-" + m.source] = true
}
})
return result
Expand Down Expand Up @@ -155,11 +155,58 @@ export default {
}
return { linkDataArray: linkDataArray, nodes: nodes, podsNodes: podsNodes }
},
toEnd(s) {
const str = s || "";
if (str.endsWith("/")) {
return str;
} else {
return str + "/";
}
},
toEndExp(s) {
const str = s || "";
if (str.endsWith("/")) {
return str;
} else {
return str + "(/|$)";
}
},
matchUrl(ingress, url,host ,path,pathType) {

let urlForMatch ="";
if (ingress.spec.tls != null && ingress.spec.tls.length > 0) {
urlForMatch=urlForMatch+"https://"+host+path;
} else {
urlForMatch=urlForMatch+"http://"+host+path;
}
if(pathType == "Prefix"){
return this.toEnd(url).startsWith(this.toEnd(urlForMatch))
} else if(pathType == "Exact"){
return this.toEnd(url) == this.toEnd(urlForMatch)
} else if(pathType == "ImplementationSpecific"){
if(this.toEnd(url).startsWith(this.toEnd(urlForMatch))){
return true
} else {
if(this.toEnd(url).match(this.toEndExp(urlForMatch))){
return true
} else {
return false
}
}
} else {
return this.toEnd(url).startsWith(this.toEnd(urlForMatch))
}
},
async renderCharts() {
if (document.getElementById("ingress-search-charts") == null) {
return
}
if (!this.search_url && !this.search_url.startsWith("http")) {
if (!this.search_url || this.search_url ==""){
this.$message.error("please input the url for ingress search")
return
}
if (!this.search_url || !this.search_url.startsWith("http")) {
this.$message.error("url is invalid")
return
}
this.loading = true
Expand Down Expand Up @@ -189,23 +236,14 @@ export default {
if (rule.host == search_host) {
is_same_domain = true

if (ingress.spec.tls != null && ingress.spec.tls.length > 0) {

for (var k = 0; k < rule.http.paths.length; k++) {
var path = rule.http.paths[k]
if (this.search_url.startsWith("https://" + rule.host + path.path)) {
is_same_path = true
break
}
}
} else {
for (var k = 0; k < rule.http.paths.length; k++) {
for (var k = 0; k < rule.http.paths.length; k++) {
var path = rule.http.paths[k]
if (this.search_url.startsWith("http://" + rule.host + path.path)) {

if(this.matchUrl(ingress,this.search_url,rule.host,path.path,path.pathType)){
is_same_path = true
break
}
}

}
}
}
Expand Down