cert: add ddns domain to server cert.

Author: pymumu

src/dns_conf/ddns_domain.c

@@ -18,6 +18,14 @@
 
 #include "ddns_domain.h"
 #include "domain_rule.h"
+#include "smartdns/lib/stringutil.h"
+
+static char ddns_domain[DNS_MAX_CNAME_LEN] = {0};
+
+const char *dns_conf_get_ddns_domain(void)
+{
+	return ddns_domain;
+}
 
 int _config_ddns_domain(void *data, int argc, char *argv[])
 {
@@ -27,6 +35,7 @@ int _config_ddns_domain(void *data, int argc, char *argv[])
 	}
 
 	const char *domain = argv[1];
+	safe_strncpy(ddns_domain, domain, sizeof(ddns_domain));
 	_config_domain_rule_flag_set(domain, DOMAIN_FLAG_SMARTDNS_DOMAIN, 0);
 	return 0;
 }

src/include/smartdns/dns_conf.h

@@ -786,6 +786,8 @@ const char *dns_conf_get_cache_dir(void);
 
 const char *dns_conf_get_data_dir(void);
 
+const char *dns_conf_get_ddns_domain(void);
+
 #ifdef __cplusplus
 }
 #endif

src/include/smartdns/util.h

@@ -138,7 +138,7 @@ int SSL_base64_encode(const void *in, int in_len, char *out);
 
 int generate_cert_key(const char *key_path, const char *cert_path, const char *root_key_path, const char *san, int days);
 
-int generate_cert_san(char *san, int max_san_len);
+int generate_cert_san(char *san, int max_san_len, const char *append_san);
 
 int is_cert_valid(const char *cert_file_path);
 

src/smartdns.c

@@ -382,6 +382,7 @@ static int _smartdns_create_cert(void)
 	char san[PATH_MAX] = {0};
 	/* 13 month */
 	int validity_days = 13 * 30;
+	char ddns_san[DNS_MAX_CNAME_LEN] = {0};
 
 	if (dns_conf.need_cert == 0) {
 		return 0;
@@ -409,8 +410,12 @@ static int _smartdns_create_cert(void)
 		unlink(dns_conf.bind_ca_key_file);
 		tlog(TLOG_WARN, "regenerate cert with root ca key %s", dns_conf.bind_root_ca_key_file);
 	}
+	
+	if (dns_conf_get_ddns_domain()[0] != 0) {
+		snprintf(ddns_san, sizeof(ddns_san), "DNS:%s", dns_conf_get_ddns_domain());
+	}
 
-	if (generate_cert_san(san, sizeof(san)) != 0) {
+	if (generate_cert_san(san, sizeof(san), ddns_san) != 0) {
 		tlog(TLOG_WARN, "generate cert san failed.");
 		return -1;
 	}

src/utils/ssl.c

@@ -94,7 +94,7 @@ int is_cert_valid(const char *cert_file_path)
 	return ret;
 }
 
-int generate_cert_san(char *san, int max_san_len)
+int generate_cert_san(char *san, int max_san_len, const char *append_san)
 {
 	char hostname[DNS_MAX_HOSTNAME_LEN];
 	char domainname[DNS_MAX_HOSTNAME_LEN];
@@ -117,11 +117,13 @@ int generate_cert_san(char *san, int max_san_len)
 	}
 	san_len += len;
 
-	len = snprintf(san + san_len, max_san_len - san_len, ",DNS:%s", "localhost");
-	if (len < 0 || len >= max_san_len - san_len) {
-		return -1;
+	if (append_san != NULL && append_san[0] != '\0') {
+		len = snprintf(san + san_len, max_san_len - san_len, ",%s", append_san);
+		if (len < 0 || len >= max_san_len - san_len) {
+			return -1;
+		}
+		san_len += len;
 	}
-	san_len += len;
 
 	/* get local domain name */
 	if (getdomainname(domainname, DNS_MAX_HOSTNAME_LEN - 1) == 0) {