github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "fix(stacks): confirm enable tls verification [EE-5410]" (#8972)

pull/8987/head
Chaim Lev-Ari 2023-05-22 11:02:25 +07:00 committed by GitHub
parent 0dba9b709d
commit 64d481ae2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
View File

@ -4,7 +4,6 @@ import { buildConfirmButton } from '@@/modals/utils';
import { ModalType } from '@@/modals'; import { ModalType } from '@@/modals';
import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils';
import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper';
import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils';
class KubernetesRedeployAppGitFormController { class KubernetesRedeployAppGitFormController {
/* @ngInject */ /* @ngInject */
@ -72,13 +71,6 @@ class KubernetesRedeployAppGitFormController {
onChangeTLSSkipVerify(value) { onChangeTLSSkipVerify(value) {
return this.$async(async () => { return this.$async(async () => {
if (this.stack.GitConfig.TLSSkipVerify && !value) {
const confirmed = await confirmEnableTLSVerify();
if (!confirmed) {
return;
}
}
this.onChange({ TLSSkipVerify: value }); this.onChange({ TLSSkipVerify: value });
}); });
} }

14
app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js
View File

@ -4,7 +4,6 @@ import { confirmStackUpdate } from '@/react/docker/stacks/common/confirm-stack-u
import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils';
import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper';
import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils';
class StackRedeployGitFormController { class StackRedeployGitFormController {
/* @ngInject */ /* @ngInject */
@ -96,17 +95,8 @@ class StackRedeployGitFormController {
this.onChange({ Env: value }); this.onChange({ Env: value });
} }
async onChangeTLSSkipVerify(value) { onChangeTLSSkipVerify(value) {
return this.$async(async () => { this.onChange({ TLSSkipVerify: value });
if (this.model.TLSSkipVerify && !value) {
const confirmed = await confirmEnableTLSVerify();
if (!confirmed) {
return;
}
}
this.onChange({ TLSSkipVerify: value });
});
} }
onChangeOption(values) { onChangeOption(values) {

10
app/react/portainer/gitops/utils.ts
View File

@ -1,5 +1,3 @@
import { confirm } from '@@/modals/confirm';
import { GitFormModel } from './types'; import { GitFormModel } from './types';
export function getAuthentication( export function getAuthentication(
@ -20,11 +18,3 @@ export function getAuthentication(
password: model.RepositoryPassword, password: model.RepositoryPassword,
}; };
} }
export function confirmEnableTLSVerify() {
return confirm({
title: 'Enable TLS Verification?',
message:
'Enabling the verification of TLS certificates without ensuring the correct configuration of your Certificate Authority (CA) for self-signed certificates can result in deployment failures.',
});
}