SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 75 Pull Requests 3 Projects 1 Releases 24 Wiki Activity

Fix infect stage and DKIM

pull/85/head
Inex Code 2022-02-08 09:59:35 +03:00
parent a0edbd636d
commit d06e8976c5
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/logic/api_maps/hetzner.dart
View File

@ -1,4 +1,3 @@
import 'dart:convert';
import 'dart:io';
import 'package:dio/dio.dart';
@ -134,8 +133,9 @@ class HetznerApi extends ApiMap {
/// add ssh key when you need it: e.g. "ssh_keys":["kherel"]
/// check the branch name, it could be "development" or "master".
///
final userdataString = "#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-21.05 DOMAIN='$domainName' LUSER='${escapeQuotes(rootUser.login)}' PASSWORD='${escapeQuotes(rootUser.password)}' CF_TOKEN=$cloudFlareKey DB_PASSWORD=${escapeQuotes(dbPassword)} API_TOKEN=$apiToken HOSTNAME=${escapeQuotes(hostname)} bash 2>&1 | tee /tmp/infect.log";
///
final userdataString =
"#cloud-config\nruncmd:\n- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-21.05 DOMAIN='$domainName' LUSER='${escapeQuotes(rootUser.login)}' PASSWORD='${escapeQuotes(rootUser.password)}' CF_TOKEN=$cloudFlareKey DB_PASSWORD=${escapeQuotes(dbPassword)} API_TOKEN=$apiToken HOSTNAME=${escapeQuotes(hostname)} bash 2>&1 | tee /tmp/infect.log";
print(userdataString);
final data = {
@ -259,8 +259,11 @@ class HetznerApi extends ApiMap {
String escapeQuotes(String str) {
// replace all single quotes with escaped single quotes for bash strong quotes (i.e. '\'' )
print("Escaping single quotes for bash: $str");
print("Escaping result: ${str.replaceAll(RegExp(r"'"), "'\\''")}");
// print("Escaping single quotes for bash: $str");
// print("Escaping result: ${str.replaceAll(RegExp(r"'"), "'\\''")}");
// also escape all double quotes for json
return str.replaceAll(RegExp(r"'"), "'\\''");
// return str.replaceAll(RegExp(r"'"), "'\\''");
// Pass for now
return str;
}

8
lib/logic/api_maps/server.dart
View File

@ -1,6 +1,6 @@
import 'dart:async';
import 'dart:io';
import 'dart:convert';
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:selfprivacy/config/get_it_config.dart';
@ -250,7 +250,11 @@ class ServerApi extends ApiMap {
final base64toString = utf8.fuse(base64);
return base64toString.decode(response.data).split('(')[1].split(')')[0];
return base64toString
.decode(response.data)
.split('(')[1]
.split(')')[0]
.replaceAll('"', '');
}
}