Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Zvonimir
ISPConfig 3
Commits
4c794a56
Commit
4c794a56
authored
Aug 07, 2014
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Suppress output from exec
parent
06787deb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
interface/web/mail/mail_domain_dkim_create.php
interface/web/mail/mail_domain_dkim_create.php
+3
-3
server/plugins-available/mail_plugin_dkim.inc.php
server/plugins-available/mail_plugin_dkim.inc.php
+1
-1
No files found.
interface/web/mail/mail_domain_dkim_create.php
View file @
4c794a56
...
...
@@ -80,7 +80,7 @@ function get_public_key($private_key) {
require_once
(
'../../lib/classes/validate_dkim.inc.php'
);
$validate_dkim
=
new
validate_dkim
();
if
(
$validate_dkim
->
validate_post
(
'private'
,
$private_key
))
{
/* validate the $_POST-value */
exec
(
'echo '
.
escapeshellarg
(
$private_key
)
.
'|openssl rsa -pubout -outform PEM'
,
$pubkey
,
$result
);
exec
(
'echo '
.
escapeshellarg
(
$private_key
)
.
'|openssl rsa -pubout -outform PEM
2> /dev/null
'
,
$pubkey
,
$result
);
$public_key
=
pub_key
(
$pubkey
);
}
else
{
$public_key
=
'invalid key'
;
...
...
@@ -92,8 +92,8 @@ $_POST=getRealPOST();
switch
(
$_POST
[
'action'
])
{
case
'create'
:
/* create DKIM Private-key */
exec
(
'openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096'
,
$output
,
$result
);
exec
(
'openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024'
,
$privkey
,
$result
);
exec
(
'openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096
2> /dev/null
'
,
$output
,
$result
);
exec
(
'openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024
2> /dev/null
'
,
$privkey
,
$result
);
unlink
(
"/usr/local/ispconfig/server/temp/random-data.bin"
);
foreach
(
$privkey
as
$values
)
$private_key
=
$private_key
.
$values
.
"
\n
"
;
break
;
...
...
server/plugins-available/mail_plugin_dkim.inc.php
View file @
4c794a56
...
...
@@ -181,7 +181,7 @@ class mail_plugin_dkim {
$app
->
log
(
'Saved DKIM Private-key to '
.
$key_file
.
'.private'
,
LOGLEVEL_DEBUG
);
$success
=
true
;
/* now we get the DKIM Public-key */
exec
(
'cat '
.
escapeshellarg
(
$key_file
.
'.private'
)
.
'|openssl rsa -pubout'
,
$pubkey
,
$result
);
exec
(
'cat '
.
escapeshellarg
(
$key_file
.
'.private'
)
.
'|openssl rsa -pubout
2> /dev/null
'
,
$pubkey
,
$result
);
$public_key
=
''
;
foreach
(
$pubkey
as
$values
)
$public_key
=
$public_key
.
$values
.
"
\n
"
;
/* save the DKIM Public-key in dkim-dir */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment