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.

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

Jump to bottom

Fix configuration security vulnerabilities #90

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Fix configuration security vulnerabilities #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 27 additions & 21 deletions src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,8 @@ public int interestInterval(final @NotNull Account.Type type) {
// messages.errors.disallowed-characters
public @NotNull Component messagesErrorsDisallowedCharacters(final @NotNull String characters) {
return MiniMessage.miniMessage().deserialize(
Objects.requireNonNull(config.getString("messages.errors.disallowed-characters"))
.replace("<characters>", characters)
Objects.requireNonNull(config.getString("messages.errors.disallowed-characters")),
Placeholder.unparsed("characters", characters)
);
}

Expand Down Expand Up @@ -799,10 +799,12 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<to-balance-short>", BankAccounts.formatCurrencyShort(from.balance))
.replace("<amount>", amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(amount))
.replace("<description>", description == null ? "<gray><i>no description</i>" : description)
.replace("<confirm-command>", "/bank transfer --confirm " + from.id + " " + to.id + " " + amount.toPlainString() + (description == null ? "" : " " + description))
);
.replace("<amount-short>", BankAccounts.formatCurrencyShort(amount)),
Placeholder.component("description", description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(description))
).replaceText(configurer -> {
configurer.matchLiteral("<confirm-command>");
configurer.replacement(Component.text("/bank transfer --confirm " + from.id + " " + to.id + " " + amount.toPlainString() + (description == null ? "" : " " + description)));
});
}

// messages.transfer-sent
Expand All @@ -826,9 +828,9 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<amount>", transaction.amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(transaction.amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(transaction.amount))
.replace("<description>", transaction.description == null ? "<gray><i>no description</i>" : transaction.description)
.replace("<transaction-id>", String.valueOf(transaction.getId()))
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument)
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument),
Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(transaction.description))
);
}

Expand All @@ -853,9 +855,9 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<amount>", transaction.amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(transaction.amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(transaction.amount))
.replace("<description>", transaction.description == null ? "<gray><i>no description</i>" : transaction.description)
.replace("<transaction-id>", String.valueOf(transaction.getId()))
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument)
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument),
Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(transaction.description))
);
}

Expand Down Expand Up @@ -903,12 +905,12 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<amount>", amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(amount))
.replace("<description>", transaction.description == null ? "<gray><i>no description</i></gray>" : transaction.description)
.replace("<transaction-id>", String.valueOf(transaction.getId()))
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument)
.replace("<full_date>", sdf.format(transaction.time) + " UTC")
.replace("<full-date>", sdf.format(transaction.time) + " UTC"),
Formatter.date("date", transaction.time.toInstant().atZone(ZoneOffset.UTC).toLocalDateTime())
Formatter.date("date", transaction.time.toInstant().atZone(ZoneOffset.UTC).toLocalDateTime()),
Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(transaction.description))
);
}

Expand Down Expand Up @@ -954,12 +956,12 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<price>", pos.price.toPlainString())
.replace("<price-formatted>", BankAccounts.formatCurrency(pos.price))
.replace("<price-short>", BankAccounts.formatCurrencyShort(pos.price))
.replace("<description>", pos.description == null ? "<gray><i>no description</i></gray>" : pos.description)
.replace("<x>", String.valueOf(pos.x))
.replace("<y>", String.valueOf(pos.y))
.replace("<z>", String.valueOf(pos.z))
.replace("<pos>", "X: " + pos.x + " Y: " + pos.y + " Z: " + pos.z + " in " + pos.world.getName())
.replace("<world>", pos.world.getName())
.replace("<world>", pos.world.getName()),
Placeholder.component("description", pos.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(pos.description))
);
}

Expand Down Expand Up @@ -989,11 +991,11 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<amount>", transaction.amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(transaction.amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(transaction.amount))
.replace("<description>", transaction.description == null ? "<gray><i>no description</i>" : transaction.description)
.replace("<transaction-id>", String.valueOf(transaction.getId()))
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument)
.replace("<items>", String.valueOf(items.length))
.replace("<items-formatted>", items.length == 1 ? "1 item" : items.length + " items")
.replace("<items-formatted>", items.length == 1 ? "1 item" : items.length + " items"),
Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(transaction.description))
);
}

Expand All @@ -1018,11 +1020,11 @@ public int interestInterval(final @NotNull Account.Type type) {
.replace("<amount>", transaction.amount.toPlainString())
.replace("<amount-formatted>", BankAccounts.formatCurrency(transaction.amount))
.replace("<amount-short>", BankAccounts.formatCurrencyShort(transaction.amount))
.replace("<description>", transaction.description == null ? "<gray><i>no description</i>" : transaction.description)
.replace("<transaction-id>", String.valueOf(transaction.getId()))
.replace("<instrument>", transaction.instrument == null ? "direct transfer" : transaction.instrument)
.replace("<items>", String.valueOf(items.length))
.replace("<items-formatted>", items.length == 1 ? "1 item" : items.length + " items")
.replace("<items-formatted>", items.length == 1 ? "1 item" : items.length + " items"),
Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("<gray><i>no description</i>") : Component.text(transaction.description))
);
}

Expand All @@ -1046,9 +1048,13 @@ public int interestInterval(final @NotNull Account.Type type) {
Objects.requireNonNull(config.getString("messages.baltop.header"))
.replace("<category>", category)
.replace("<page>", String.valueOf(page))
.replace("<cmd-prev>", cmdPrev)
.replace("<cmd-next>", cmdNext)
);
).replaceText(configurer -> {
configurer.matchLiteral("<cmd-prev>");
configurer.replacement(cmdPrev);
}).replaceText(configurer -> {
configurer.matchLiteral("<cmd-next>");
configurer.replacement(cmdNext);
});
}

// messages.baltop.entry
Expand Down