Skip to content
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.

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

fix #94 如果存在返回包,sqlmap的RequestAsFile是返回包的内容 #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions src/config/ConfigEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -323,17 +323,23 @@ public String getFinalValue(IHttpRequestResponse[] messageInfos) {
return valueStr;
}

//List<String> items = TextUtils.grepWithRegex(valueStr, "\\{A-Za-z?\\}");
//正则提取在遇到json格式时,可能有非预期结果。
List<String> items = TextUtils.grepWithRegex(valueStr, "\\{[^{}]*?\\}");

List<String> httpParts = MessagePart.getPartList();
List<ConfigEntry> varConfigs = GUI.configTableModel.getBasicConfigVars();

for (String part : httpParts) {
valueStr = findAndReplace(valueStr, "{" + part + "}", getValueByPartType(messageInfos, part));
}
for (ConfigEntry config : varConfigs) {
valueStr = findAndReplace(valueStr, "{" + config.getKey() + "}", config.getValue());
for (String item : items) {
String partType = item.replace("{", "").replace("}", "");
for (String part : httpParts) {
if (partType.equalsIgnoreCase(part)) {
String value = getValueByPartType(messageInfos, partType);
valueStr = valueStr.replace(item, value);
}
}
for (ConfigEntry config : varConfigs) {
if (partType.equalsIgnoreCase(config.getKey())) {
valueStr = valueStr.replace(item, config.getValue());
}
}
}
return valueStr;
}
Expand Down
Loading