Skip to content

fix: escape regex keys in substituteVariables and await Hive writes in history providers #1652

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
nazifsco wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: escape regex keys in substituteVariables and await Hive writes in history providers #1652

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/providers/history_providers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,26 @@ class HistoryMetaStateNotifier
}
}

void addHistoryRequest(HistoryRequestModel model) async {
Future<void> addHistoryRequest(HistoryRequestModel model) async {
final id = model.historyId;
state = {...state ?? {}, id: model.metaData};
final List<String> updatedHistoryKeys = state == null
? [id]
: [...state!.keys, id];
hiveHandler.setHistoryIds(updatedHistoryKeys);
hiveHandler.setHistoryMeta(id, model.metaData.toJson());
await hiveHandler.setHistoryIds(updatedHistoryKeys);
await hiveHandler.setHistoryMeta(id, model.metaData.toJson());
await hiveHandler.setHistoryRequest(id, model.toJson());
await loadHistoryRequest(id);
}

void editHistoryRequest(HistoryRequestModel model) async {
Future<void> editHistoryRequest(HistoryRequestModel model) async {
final id = model.historyId;
state = {...state ?? {}, id: model.metaData};
final existingKeys = state?.keys.toList() ?? [];
if (!existingKeys.contains(id)) {
hiveHandler.setHistoryIds([...existingKeys, id]);
await hiveHandler.setHistoryIds([...existingKeys, id]);
}
hiveHandler.setHistoryMeta(id, model.metaData.toJson());
await hiveHandler.setHistoryMeta(id, model.metaData.toJson());
await hiveHandler.setHistoryRequest(id, model.toJson());
await loadHistoryRequest(id);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/utils/envvar_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ String? substituteVariables(
if (envVarMap.keys.isEmpty) {
return input;
}
final regex = RegExp("{{(${envVarMap.keys.join('|')})}}");
final escapedKeys = envVarMap.keys.map(RegExp.escape).join('|');
final regex = RegExp("{{($escapedKeys)}}");

String result = input.replaceAllMapped(regex, (match) {
final key = match.group(1)?.trim() ?? '';
Expand Down