res_phreaknet: Reload keys prior to 'keys fetch' operation.

If keys have been removed from disk when a key reload occurs, then
ast_key_get will return the key even though it no longer exists.
Reload keys beforehand so that keys are processed as newly created
keys rather than updated ones.

Author: InterLinked1

phreaknet.sh

@@ -4185,7 +4185,10 @@ elif [ "$cmd" = "keygen" ]; then
 	else
 		printf "%s\n" "No InterLinked API key and/or CLLI on file, skipping upload of public key..."
 	fi
-	touch $AST_CONFIG_DIR/iax-phreaknet-rsa-in.conf
+	if [ ! -f $AST_CONFIG_DIR/iax-phreaknet-rsa-in.conf ]; then
+		# Instantiate the file with an empty 'inkeys' setting, so that any config modifications of iax.conf will put the keys there instead of in iax.conf
+		echo "inkeys = " > $AST_CONFIG_DIR/iax-phreaknet-rsa-in.conf
+	fi
 	# touch $AST_CONFIG_DIR/iax-phreaknet-rsa-out.conf # no longer necessary for >= 18.9
 	# Determine what user Asterisk is running as.
 	# cut on ; before = so that we properly handled commented out lines.

res/res_phreaknet.c

@@ -337,7 +337,7 @@ static struct ast_str *curl_get(const char *url, const char *data)
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
 	curl_easy_cleanup(curl);
 
-	ast_debug(3, "Response: %s\n", ast_str_buffer(str));
+	ast_debug(5, "Response: %s\n", ast_str_buffer(str));
 	if (http_code / 100 != 2) {
 		ast_log(LOG_ERROR, "Failed to retrieve URL '%s': HTTP response code %ld\n", url, http_code);
 		ast_free(str);
@@ -804,6 +804,12 @@ static int update_rsa_pubkeys(void)
 		return -1;
 	}
 
+	/* Reload keys before making the API request and calling ast_key_get to see if the key exists.
+	 * This way, if a key was removed manually since keys were last loaded,
+	 * ast_key_get will no longer return that the key exists,
+	 * and we'll process a key creation, rather than an update. */
+	ast_module_reload("res_crypto");
+
 	ast_debug(1, "Synchronizing RSA public keys\n");
 
 	snprintf(url, sizeof(url), "https://api.phreaknet.org/v1/rsa?key=%s&fetchall&version=%s", interlinked_api_key, ast_get_version());
@@ -894,6 +900,7 @@ static int update_rsa_pubkeys(void)
 		}
 		fprintf(fp, "%s", key);
 		fclose(fp);
+		/* close() not needed here, fclose() will also close fd */
 		unlink(tmp_filename);
 
 		/* XXX Future improvement would be to delete public keys that no longer exist (and remove from chan_iax2 config) */