Skip to content

Commit 38af4c7

Browse files
committed
fix: migrate CRL admin state to effective policies
Signed-off-by: Vitor Mattos <[email protected]>
1 parent e8b18c7 commit 38af4c7

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

lib/Settings/Admin.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public function getForm(): TemplateResponse {
8383
$this->initialState->provideInitialState('signing_mode', $this->getSigningModeInitialState());
8484
$this->initialState->provideInitialState('worker_type', $this->getWorkerTypeInitialState());
8585
$this->initialState->provideInitialState('parallel_workers', $this->appConfig->getValueString(Application::APP_ID, 'parallel_workers', '4'));
86-
$this->initialState->provideInitialState('crl_external_validation_enabled', $this->appConfig->getValueBool(Application::APP_ID, 'crl_external_validation_enabled', true));
8786
$this->initialState->provideInitialState('ldap_extension_available', function_exists('ldap_connect'));
8887

8988
$response = new TemplateResponse(Application::APP_ID, 'admin_settings');

src/types/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ export type AdminInitialState = {
134134
signing_mode: SigningModeState
135135
worker_type: WorkerTypeState
136136
parallel_workers: string
137-
show_confetti_after_signing: boolean
138-
crl_external_validation_enabled: boolean
139137
ldap_extension_available: boolean
140-
envelope_enabled: boolean
141138
}
142139

143140
export type RuntimeFileSettingsRecord = FileSettings & Partial<SettingsRecord>

tests/integration/features/admin/initial_state.feature

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Feature: admin/initial_state
162162
| (jq)(.policies.approval_group.effectiveValue \| fromjson \| .[0]) | admin |
163163
| (jq).policies.envelope_enabled.effectiveValue | true |
164164
| (jq).policies.show_confetti_after_signing.effectiveValue | true |
165+
| (jq).policies.crl_external_validation_enabled.effectiveValue | true |
165166
| (jq).policies.tsa_settings.policyKey | tsa_settings |
166167
| (jq).policies.tsa_settings.sourceScope | system |
167168
| (jq)(.policies.tsa_settings.effectiveValue \| fromjson).auth_type | none |
@@ -177,10 +178,6 @@ Feature: admin/initial_state
177178
"""
178179
"4"
179180
"""
180-
And the response should contain the initial state "libresign-crl_external_validation_enabled" with the following values:
181-
"""
182-
true
183-
"""
184181
And run the command "user:setting admin libresign files_list_sorting_mode --delete" with result code 0
185182
And run the command "user:setting admin libresign files_list_sorting_direction --delete" with result code 0
186183

@@ -292,6 +289,7 @@ Feature: admin/initial_state
292289
| (jq)(.policies.approval_group.effectiveValue \| fromjson \| .[1]) | staff |
293290
| (jq).policies.envelope_enabled.effectiveValue | false |
294291
| (jq).policies.show_confetti_after_signing.effectiveValue | false |
292+
| (jq).policies.crl_external_validation_enabled.effectiveValue | false |
295293
| (jq).policies.tsa_settings.policyKey | tsa_settings |
296294
| (jq).policies.tsa_settings.sourceScope | global |
297295
| (jq)(.policies.tsa_settings.effectiveValue \| fromjson).url | https://tsa.example.test/tsr |
@@ -310,10 +308,6 @@ Feature: admin/initial_state
310308
"""
311309
"9"
312310
"""
313-
And the response should contain the initial state "libresign-crl_external_validation_enabled" with the following values:
314-
"""
315-
false
316-
"""
317311
And the following libresign app config is set
318312
| certificate_engine | openssl |
319313
| certificate_policies_oid | |

0 commit comments

Comments
 (0)