Skip to content

Commit

Permalink
fix: [curl] escape [&\] (#577)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tangcent
tangcent authored Sep 4, 2021
1 parent 8c833a7 commit 36b3388
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/curl/CurlFormatter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class CurlFormatter {
.append("?")
request.querys!!.forEach { param ->
if (query.lastOrNull() != '?') {
query.append("&")
query.append("\\&")
}
query.append(param.name).append("=")
param.value?.let { query.append(it) }
Expand All @@ -110,6 +110,6 @@ class CurlFormatter {
}

private fun String.escape(): String {
return this.replace("'", "\\'")
return this.replace("\\", "\\\\").replace("'", "\\'")
}
}
8 changes: 4 additions & 4 deletions ...src/test/resources/result/com.itangcent.idea.plugin.api.export.curl.CurlFormatterTest.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ curl -X GET -H 'x-token: ' -H 'token: ' http://localhost:8080/test/header

## test query with array parameters
```bash
curl -X GET -H 'token: ' http://localhost:8080/test/arrays?string=&int=1
curl -X GET -H 'token: ' http://localhost:8080/test/arrays?string=\&int=1
```

---
Expand Down Expand Up @@ -99,7 +99,7 @@ curl -X POST -H 'Content-Type: multipart/form-data' -H 'token: ' -F 'id=' -F 'co

## return root with nested nodes
```bash
curl -X GET -H 'token: ' http://localhost:8080/test/return/root?id=&children[0].id=&children[0].code=&children[0].parent.id=&children[0].parent.code=&children[0].parent.parent={}&children[0].parent.sub[0]={}&children[0].parent.siblings[0]={}&children[0].sub[0].id=&children[0].sub[0].code=&children[0].sub[0].parent.id=&children[0].sub[0].parent.code=&children[0].sub[0].parent.parent={}&children[0].sub[0].parent.sub[0]={}&children[0].sub[0].parent.siblings[0]={}&children[0].sub[0].sub[0]={}&children[0].sub[0].siblings[0]={}&children[0].siblings[0].id=&children[0].siblings[0].code=&children[0].siblings[0].parent.id=&children[0].siblings[0].parent.code=&children[0].siblings[0].parent.parent.id=&children[0].siblings[0].parent.parent.code=&children[0].siblings[0].parent.parent.parent={}&children[0].siblings[0].parent.parent.sub[0]={}&children[0].siblings[0].parent.parent.siblings[0]={}&children[0].siblings[0].parent.sub[0]={}&children[0].siblings[0].parent.siblings[0]={}&children[0].siblings[0].sub[0].id=&children[0].siblings[0].sub[0].code=&children[0].siblings[0].sub[0].parent.id=&children[0].siblings[0].sub[0].parent.code=&children[0].siblings[0].sub[0].parent.parent={}&children[0].siblings[0].sub[0].parent.sub[0]={}&children[0].siblings[0].sub[0].parent.siblings[0]={}&children[0].siblings[0].sub[0].sub[0]={}&children[0].siblings[0].sub[0].siblings[0]={}&children[0].siblings[0].siblings[0].id=&children[0].siblings[0].siblings[0].code=&children[0].siblings[0].siblings[0].parent.id=&children[0].siblings[0].siblings[0].parent.code=&children[0].siblings[0].siblings[0].parent.parent={}&children[0].siblings[0].siblings[0].parent.sub[0]={}&children[0].siblings[0].siblings[0].parent.siblings[0]={}&children[0].siblings[0].siblings[0].sub[0]={}&children[0].siblings[0].siblings[0].siblings[0]={}
curl -X GET -H 'token: ' http://localhost:8080/test/return/root?id=\&children[0].id=\&children[0].code=\&children[0].parent.id=\&children[0].parent.code=\&children[0].parent.parent={}\&children[0].parent.sub[0]={}\&children[0].parent.siblings[0]={}\&children[0].sub[0].id=\&children[0].sub[0].code=\&children[0].sub[0].parent.id=\&children[0].sub[0].parent.code=\&children[0].sub[0].parent.parent={}\&children[0].sub[0].parent.sub[0]={}\&children[0].sub[0].parent.siblings[0]={}\&children[0].sub[0].sub[0]={}\&children[0].sub[0].siblings[0]={}\&children[0].siblings[0].id=\&children[0].siblings[0].code=\&children[0].siblings[0].parent.id=\&children[0].siblings[0].parent.code=\&children[0].siblings[0].parent.parent.id=\&children[0].siblings[0].parent.parent.code=\&children[0].siblings[0].parent.parent.parent={}\&children[0].siblings[0].parent.parent.sub[0]={}\&children[0].siblings[0].parent.parent.siblings[0]={}\&children[0].siblings[0].parent.sub[0]={}\&children[0].siblings[0].parent.siblings[0]={}\&children[0].siblings[0].sub[0].id=\&children[0].siblings[0].sub[0].code=\&children[0].siblings[0].sub[0].parent.id=\&children[0].siblings[0].sub[0].parent.code=\&children[0].siblings[0].sub[0].parent.parent={}\&children[0].siblings[0].sub[0].parent.sub[0]={}\&children[0].siblings[0].sub[0].parent.siblings[0]={}\&children[0].siblings[0].sub[0].sub[0]={}\&children[0].siblings[0].sub[0].siblings[0]={}\&children[0].siblings[0].siblings[0].id=\&children[0].siblings[0].siblings[0].code=\&children[0].siblings[0].siblings[0].parent.id=\&children[0].siblings[0].siblings[0].parent.code=\&children[0].siblings[0].siblings[0].parent.parent={}\&children[0].siblings[0].siblings[0].parent.sub[0]={}\&children[0].siblings[0].siblings[0].parent.siblings[0]={}\&children[0].siblings[0].siblings[0].sub[0]={}\&children[0].siblings[0].siblings[0].siblings[0]={}
```

---
Expand All @@ -113,7 +113,7 @@ curl -X GET -H 'token: ' http://localhost:8080/test/return/customMap?key=

## user page query
```bash
curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user?size=&user.id=0&user.type=0&user.name=&user.age=0&user.sex=0&user.birthDay=&user.regtime=&users[0].id=0&users[0].type=0&users[0].name=&users[0].age=0&users[0].sex=0&users[0].birthDay=&users[0].regtime=&t.id=0&t.type=0&t.name=&t.age=0&t.sex=0&t.birthDay=&t.regtime=
curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user?size=\&user.id=0\&user.type=0\&user.name=\&user.age=0\&user.sex=0\&user.birthDay=\&user.regtime=\&users[0].id=0\&users[0].type=0\&users[0].name=\&users[0].age=0\&users[0].sex=0\&users[0].birthDay=\&users[0].regtime=\&t.id=0\&t.type=0\&t.name=\&t.age=0\&t.sex=0\&t.birthDay=\&t.regtime=
```

---
Expand All @@ -134,5 +134,5 @@ curl -X POST -H 'Content-Type: multipart/form-data' -H 'token: ' -F 'size=' -F '

## user page query with array
```bash
curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user/array?id=0&type=0&name=&age=0&sex=0&birthDay=&regtime=
curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user/array?id=0\&type=0\&name=\&age=0\&sex=0\&birthDay=\&regtime=
```

0 comments on commit 36b3388

Please sign in to comment.