Skip to content

Commit 65d0c31

Browse files
chore: use Model::set_config instead of config_set_path
1 parent 23cd0db commit 65d0c31

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/.resources/scripts/manage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ function delete(): void {
426426
*/
427427
function rotate_server_key(): void {
428428
$pkg_index = RESTAPISettings::get_pkg_id();
429-
config_set_path("installedpackages/package/$pkg_index/conf/keys", []);
429+
Model::set_config("installedpackages/package/$pkg_index/conf/keys", []);
430430
echo 'Rotating REST API server key... ';
431431
RESTAPIJWT::init_server_key(rotate: true);
432432
echo 'done.' . PHP_EOL;

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/RESTAPIJWT.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class RESTAPIJWT extends Model {
4848
if (empty($api_config['server_key']) or $rotate === true) {
4949
# Try to generate the server key, throw a ServerError if we cannot
5050
try {
51-
config_set_path("installedpackages/package/$pkg_id/conf/server_key", bin2hex(random_bytes(32)));
51+
Model::set_config("installedpackages/package/$pkg_id/conf/server_key", bin2hex(random_bytes(32)));
5252
write_config('API server key created');
5353
} catch (Exception) {
5454
throw new ServerError(

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/RESTAPISettings.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ class RESTAPISettings extends Model {
294294
return API_SETTINGS_RESTORE_NO_CHANGE;
295295
}
296296

297-
config_set_path("installedpackages/package/$current_api_id/conf", $backup_api_conf);
297+
Model::set_config("installedpackages/package/$current_api_id/conf", $backup_api_conf);
298298
write_config('Synchronized persistent API configuration');
299299
return API_SETTINGS_RESTORE_SUCCESS;
300300
}

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsAPIJWTTestCase.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class APIModelsAPIJWTTestCase extends TestCase {
3333
$this->assert_not_equals($first_server_key, $second_server_key);
3434

3535
# Remove the JWT server key created by generate_jwt()
36-
config_set_path("installedpackages/package/{$api_pkg_id}/conf/server_key", '');
36+
Model::set_config("installedpackages/package/{$api_pkg_id}/conf/server_key", '');
3737
write_config('Unit test removed JWT server key used for testing');
3838
}
3939

@@ -62,7 +62,7 @@ class APIModelsAPIJWTTestCase extends TestCase {
6262
$this->assert_equals($decoded_jwt['data'], 'admin');
6363

6464
# Remove the JWT server key created by generate_jwt()
65-
config_set_path("installedpackages/package/{$api_pkg_id}/conf/server_key", '');
65+
Model::set_config("installedpackages/package/{$api_pkg_id}/conf/server_key", '');
6666
write_config('Unit test removed JWT server key used for testing');
6767
}
6868
}

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsAPISettingsTestCase.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class APIModelsAPISettingsTestCase extends TestCase {
8787
# Capture the current API config, delete the running API config, restore it from backup and ensure it matches
8888
$api_config_id = $api_settings->get_pkg_id();
8989
$original_api_config = $api_settings->get_pkg_config();
90-
config_set_path("installedpackages/package/$api_config_id/conf", [
90+
Model::set_config("installedpackages/package/$api_config_id/conf", [
9191
'keep_backup' => 'enabled',
9292
'bad-field' => true,
9393
]);

0 commit comments

Comments
 (0)