From 5bfab0a79639924b666ce20647a8fe469838f0fe Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Fri, 18 Jun 2021 06:38:10 +0300
Subject: [PATCH] add certsdir option (#1642)

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 contrib/i2pd.conf  | 4 ++++
 libi2pd/Config.cpp | 1 +
 libi2pd/Family.cpp | 9 ++++++++-
 libi2pd/Reseed.cpp | 9 ++++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/contrib/i2pd.conf b/contrib/i2pd.conf
index f3cea2b5..7b85a61b 100644
--- a/contrib/i2pd.conf
+++ b/contrib/i2pd.conf
@@ -15,6 +15,10 @@
 ## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d
 # tunnelsdir = /var/lib/i2pd/tunnels.d
 
+## Path to certificates used for verifying .su3, families
+## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates
+# certsdir = /var/lib/i2pd/certificates
+
 ## Where to write pidfile (default: i2pd.pid, not used in Windows)
 # pidfile = /run/i2pd.pid
 
diff --git a/libi2pd/Config.cpp b/libi2pd/Config.cpp
index a80778a1..16d50e8c 100644
--- a/libi2pd/Config.cpp
+++ b/libi2pd/Config.cpp
@@ -37,6 +37,7 @@ namespace config {
 			("conf", value<std::string>()->default_value(""),                 "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)")
 			("tunconf", value<std::string>()->default_value(""),              "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)")
 			("tunnelsdir", value<std::string>()->default_value(""),           "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d")
+			("certsdir", value<std::string>()->default_value(""),             "Path to certificates used for verifying .su3, families (default: ~/.i2pd/certificates or /var/lib/i2pd/certificates")
 			("pidfile", value<std::string>()->default_value(""),              "Path to pidfile (default: ~/i2pd/i2pd.pid or /var/lib/i2pd/i2pd.pid)")
 			("log", value<std::string>()->default_value(""),                  "Logs destination: stdout, file, syslog (stdout if not set)")
 			("logfile", value<std::string>()->default_value(""),              "Path to logfile (stdout if not set, autodetect if daemon)")
diff --git a/libi2pd/Family.cpp b/libi2pd/Family.cpp
index fbb7b9ee..baf846f6 100644
--- a/libi2pd/Family.cpp
+++ b/libi2pd/Family.cpp
@@ -98,7 +98,14 @@ namespace data
 
 	void Families::LoadCertificates ()
 	{
-		std::string certDir = i2p::fs::DataDirPath("certificates", "family");
+		std::string certDir;
+		std::string certsdir; i2p::config::GetOption("certsdir", certsdir);
+		if (!i2p::config::IsDefault("certsdir"))
+			certDir = certsdir + i2p::fs::dirSep + "family";
+
+		if (certDir.empty() || !i2p::fs::Exists(certDir))
+			std::string certDir = i2p::fs::DataDirPath("certificates", "family");
+
 		std::vector<std::string> files;
 		int numCertificates = 0;
 
diff --git a/libi2pd/Reseed.cpp b/libi2pd/Reseed.cpp
index 41111ecc..a78058cf 100644
--- a/libi2pd/Reseed.cpp
+++ b/libi2pd/Reseed.cpp
@@ -497,7 +497,14 @@ namespace data
 
 	void Reseeder::LoadCertificates ()
 	{
-		std::string certDir = i2p::fs::DataDirPath("certificates", "reseed");
+		std::string certDir;
+		std::string certsdir; i2p::config::GetOption("certsdir", certsdir);
+		if (!i2p::config::IsDefault("certsdir"))
+			certDir = certsdir + i2p::fs::dirSep + "reseed";
+
+		if (certDir.empty() || !i2p::fs::Exists(certDir))
+			std::string certDir = i2p::fs::DataDirPath("certificates", "reseed");
+
 		std::vector<std::string> files;
 		int numCertificates = 0;