Skip to content

Commit 18321d6

Browse files
feat(system-security): Add new routes to whitelisted (#7543)
1 parent 9e551ed commit 18321d6

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ quick_start.sh
6060
cmd/server/fileList.txt
6161
.fileList.txt
6262
1Panel.code-workspace
63+
64+
core/.golangci.yml
65+
agent/.golangci.yml

agent/app/service/app_install.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -746,22 +746,6 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
746746
}
747747
}
748748
}
749-
} else if form.Type == "apps" {
750-
if m, ok := form.Child.(map[string]interface{}); ok {
751-
result := make(map[string]string)
752-
for key, value := range m {
753-
if strVal, ok := value.(string); ok {
754-
result[key] = strVal
755-
}
756-
}
757-
if envKey, ok := result["envKey"]; ok {
758-
serviceName := envs[envKey]
759-
if serviceName != nil {
760-
appInstall, _ := appInstallRepo.GetFirst(appInstallRepo.WithServiceName(serviceName.(string)))
761-
appParam.ShowValue = appInstall.Name
762-
}
763-
}
764-
}
765749
}
766750

767751
params = append(params, appParam)

core/constant/common.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ var WebUrlMap = map[string]struct{}{
4545
"/apps/all": {},
4646
"/apps/installed": {},
4747
"/apps/upgrade": {},
48+
"apps/setting": {},
4849

4950
"/containers": {},
5051
"/containers/container": {},
@@ -55,6 +56,7 @@ var WebUrlMap = map[string]struct{}{
5556
"/containers/compose": {},
5657
"/containers/template": {},
5758
"/containers/setting": {},
59+
"containers/dashboard": {},
5860

5961
"/cronjobs": {},
6062

@@ -133,6 +135,7 @@ var WebUrlMap = map[string]struct{}{
133135
"/xpack/alert/setting": {},
134136
"/xpack/setting": {},
135137
"xpack/node": {},
138+
"xpack/waf/stat": {},
136139
}
137140

138141
var DynamicRoutes = []string{

frontend/src/styles/common.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ html {
123123

124124
.input-help {
125125
font-size: 12px;
126-
word-break: break-all;
127-
color: #8f959e;
126+
word-break: keep-all;
127+
color: #adb0bc;
128128
width: 100%;
129129
display: inline-block;
130-
height: 12px;
130+
white-space: normal;
131131
}
132132

133133
.input-error {
@@ -431,7 +431,7 @@ html {
431431
cursor: pointer;
432432
}
433433

434-
.dialog-footer{
434+
.dialog-footer {
435435
display: flex;
436436
align-items: center;
437437
justify-content: flex-end;

frontend/src/views/website/website/create/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@
193193
<el-option label="Node.js" value="node"></el-option>
194194
<el-option label="Java" value="java"></el-option>
195195
<el-option label="Go" value="go"></el-option>
196+
<el-option label="Python" value="python"></el-option>
197+
<el-option label=".NET" value="dotnet"></el-option>
196198
</el-select>
197199
</el-form-item>
198200
</el-col>

0 commit comments

Comments
 (0)