From 227b4bfc69a4cd48b056488aac07fec2d8e7c6f3 Mon Sep 17 00:00:00 2001 From: DonMarlowne <184617043+DonMarlowne@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:53:48 +0100 Subject: [PATCH 1/4] Added EmailSecurity section from Article to GenericInterface --- Kernel/GenericInterface/Operation/Ticket/TicketCreate.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Kernel/GenericInterface/Operation/Ticket/TicketCreate.pm b/Kernel/GenericInterface/Operation/Ticket/TicketCreate.pm index 94a0fb8e53..5f5869d8e7 100644 --- a/Kernel/GenericInterface/Operation/Ticket/TicketCreate.pm +++ b/Kernel/GenericInterface/Operation/Ticket/TicketCreate.pm @@ -154,6 +154,13 @@ perform TicketCreate Operation. This will return the created ticket number. }, # Signing and encryption, only used when ArticleSend is set to 1 + EmailSecurity => { + Backend => 'PGP', # PGP or SMIME + Method => 'Detached', # Optional Detached or Inline (defaults to Detached) + SignKey => '81877F5E', # Optional + EncryptKeys => [ '81877F5E', '3b630c80' ], # Optional + }, + # or: Sign => { Type => 'PGP', SubType => 'Inline|Detached', @@ -1730,7 +1737,7 @@ sub _TicketCreate { } # signing and encryption - for my $Key (qw( Sign Crypt )) { + for my $Key (qw( Sign Crypt EmailSecurity )) { if ( IsHashRefWithData( $Article->{$Key} ) ) { $ArticleParams{$Key} = $Article->{$Key}; } From 01b6a8510c29a320e44946e007a9292eba35247c Mon Sep 17 00:00:00 2001 From: DonMarlowne <184617043+DonMarlowne@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:23:15 +0100 Subject: [PATCH 2/4] Update ci.yaml --- .github/workflows/ci.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a34636a39..bfd47b4400 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,11 +37,6 @@ jobs: - name: Install dependencies run: znuny/.github/workflows/ci/dependencies.sh - - name: Prepare code policy - run: | - cpanm --verbose Algorithm::Diff Code::TidyAll Perl::Critic Perl::Tidy Pod::POM XML::Parser - codepolicy/bin/znuny.CodePolicy.pl --install-eslint - - name: Run code policy run: | cd "${GITHUB_WORKSPACE}/znuny" From e71ae329c912c6b8ae782925a5936204d4b7c2e8 Mon Sep 17 00:00:00 2001 From: DonMarlowne <184617043+DonMarlowne@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:31:37 +0100 Subject: [PATCH 3/4] Update ci.yaml --- .github/workflows/ci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bfd47b4400..6a34636a39 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,6 +37,11 @@ jobs: - name: Install dependencies run: znuny/.github/workflows/ci/dependencies.sh + - name: Prepare code policy + run: | + cpanm --verbose Algorithm::Diff Code::TidyAll Perl::Critic Perl::Tidy Pod::POM XML::Parser + codepolicy/bin/znuny.CodePolicy.pl --install-eslint + - name: Run code policy run: | cd "${GITHUB_WORKSPACE}/znuny" From 4c435ef34b30365f5cdf31589cca1073bca4ccf8 Mon Sep 17 00:00:00 2001 From: DonMarlowne <184617043+DonMarlowne@users.noreply.github.com> Date: Mon, 24 Mar 2025 14:18:17 +0100 Subject: [PATCH 4/4] Added EmailSecurity to TicketUpdate --- Kernel/GenericInterface/Operation/Ticket/TicketUpdate.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Kernel/GenericInterface/Operation/Ticket/TicketUpdate.pm b/Kernel/GenericInterface/Operation/Ticket/TicketUpdate.pm index ea7da43b7a..52a550ac68 100644 --- a/Kernel/GenericInterface/Operation/Ticket/TicketUpdate.pm +++ b/Kernel/GenericInterface/Operation/Ticket/TicketUpdate.pm @@ -154,6 +154,13 @@ if applicable the created ArticleID. }, # Signing and encryption, only used when ArticleSend is set to 1 + EmailSecurity => { + Backend => 'PGP', # PGP or SMIME + Method => 'Detached', # Optional Detached or Inline (defaults to Detached) + SignKey => '81877F5E', # Optional + EncryptKeys => [ '81877F5E', '3b630c80' ], # Optional + }, + # or: Sign => { Type => 'PGP', SubType => 'Inline|Detached', @@ -2279,7 +2286,7 @@ sub _TicketUpdate { } # signing and encryption - for my $Key (qw( Sign Crypt )) { + for my $Key (qw( Sign Crypt EmailSecurity )) { if ( IsHashRefWithData( $Article->{$Key} ) ) { $ArticleParams{$Key} = $Article->{$Key}; }