Merge pull request #1679 from pi-hole/new/envvars

Add environmental variables support

Author: PromoFaux

src/api/config.c

@@ -281,26 +281,8 @@ static const char *getJSONvalue(struct conf_item *conf_item, cJSON *elem, struct
 				break;
 			}
 
-			// Get password hash as allocated string (an empty string is hashed to an empty string)
-			char *pwhash = strlen(elem->valuestring) > 0 ? create_password(elem->valuestring) : strdup("");
-
-			// Verify that the password hash is valid
-			if(verify_password(elem->valuestring, pwhash, false) != PASSWORD_CORRECT)
-			{
-				free(pwhash);
+			if(!set_and_check_password(conf_item, elem->valuestring))
 				return "Failed to create password hash (verification failed), password remains unchanged";
-			}
-
-			// Get pointer to pwhash instead
-			conf_item--;
-
-			// Free previously allocated memory (if applicable)
-			if(conf_item->t == CONF_STRING_ALLOCATED)
-				free(conf_item->v.s);
-
-			// Set item
-			conf_item->v.s = pwhash;
-			log_debug(DEBUG_CONFIG, "Set %s to \"%s\"", conf_item->k, conf_item->v.s);
 
 			break;
 		}

src/config/password.c

@@ -570,3 +570,30 @@ int run_performance_test(void)
 
 	return EXIT_SUCCESS;
 }
+
+bool set_and_check_password(struct conf_item *conf_item, const char *password)
+{
+	// Get password hash as allocated string (an empty string is hashed to an empty string)
+	char *pwhash = strlen(password) > 0 ? create_password(password) : strdup("");
+
+	// Verify that the password hash is valid
+	if(verify_password(password, pwhash, false) != PASSWORD_CORRECT)
+	{
+		free(pwhash);
+		log_warn("Failed to create password hash (verification failed), password remains unchanged");
+		return false;
+	}
+
+	// Get pointer to pwhash instead
+	conf_item--;
+
+	// Free previously allocated memory (if applicable)
+	if(conf_item->t == CONF_STRING_ALLOCATED)
+		free(conf_item->v.s);
+
+	// Set item
+	conf_item->v.s = pwhash;
+	log_debug(DEBUG_CONFIG, "Set %s to \"%s\"", conf_item->k, conf_item->v.s);
+
+	return true;
+}

src/config/password.h

@@ -18,6 +18,7 @@ void sha256_raw_to_hex(uint8_t *data, char *buffer);
 char *create_password(const char *password) __attribute__((malloc));
 char verify_password(const char *password, const char *pwhash, const bool rate_limiting);
 int run_performance_test(void);
+bool set_and_check_password(struct conf_item *conf_item, const char *password);
 
 enum password_result {
 	PASSWORD_INCORRECT = 0,