mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
Implements the improvements suggested by @fredkilbourn in #1024, cleaned up for current master. **Changes:** 1. **Auto-generate RSA 2048 keypair** when creating a new DKIM key. Only generates on the create form, not on list views or edits. 2. **Descriptive signing table dropdown** shows `domain:selector (description) [id]` instead of just the numeric ID. 3. **Domain:Selector and Description columns** in the signing table list view via LEFT JOIN. 4. **Order by domain:selector** instead of raw dkim_id. **Technical notes:** - Uses `$this->new` check to avoid key generation overhead on list/edit views - Handles MySQL (`CONCAT()`) vs SQLite/PostgreSQL (`||`) string concatenation - Uses named arguments for `pacol()` per current conventions Two separate commits. Credit to @fredkilbourn for the original patch.
120 lines
4.3 KiB
PHP
120 lines
4.3 KiB
PHP
<?php
|
|
|
|
# $Id$
|
|
|
|
/**
|
|
* Handler for domain keys
|
|
*/
|
|
class DkimHandler extends PFAHandler
|
|
{
|
|
protected string $db_table = 'dkim';
|
|
protected string $id_field = 'id';
|
|
protected string $label_field = 'description';
|
|
protected ?string $domain_field = 'domain_name';
|
|
protected string $order_by = 'domain_name, selector';
|
|
|
|
|
|
protected function initStruct()
|
|
{
|
|
// Auto-generate RSA keypair as defaults for the create form
|
|
$default_private_key = '';
|
|
$default_public_key = '';
|
|
if ($this->new && function_exists('openssl_pkey_new')) {
|
|
$key = openssl_pkey_new([
|
|
'digest_alg' => 'sha512',
|
|
'private_key_bits' => 2048,
|
|
'private_key_type' => OPENSSL_KEYTYPE_RSA,
|
|
]);
|
|
if ($key) {
|
|
openssl_pkey_export($key, $default_private_key);
|
|
$details = openssl_pkey_get_details($key);
|
|
if ($details) {
|
|
$default_public_key = $details['key'];
|
|
}
|
|
}
|
|
}
|
|
|
|
$this->struct = array(
|
|
# field name allow display in... type $PALANG label $PALANG description default / options / ...
|
|
# editing? form list
|
|
'id' => self::pacol(0, 0, 1, 'num' , 'pFetchmail_field_id' , '' , '', array(), 0, 1),
|
|
'description' => self::pacol(1, 1, 1, 'text', 'description' , ''),
|
|
'selector' => self::pacol(1, 1, 1, 'text', 'pDkim_field_selector', 'pDkim_field_selector_desc'),
|
|
'domain_name' => self::pacol(1, 1, 1, 'enum', 'domain' , 'pDkim_field_domain_desc' , '', $this->allowed_domains),
|
|
'private_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pkey' , 'pDkim_field_pkey_desc' , trim($default_private_key)),
|
|
'public_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pub' , 'pDkim_field_pub_desc' , trim($default_public_key)),
|
|
);
|
|
}
|
|
|
|
protected function initMsg()
|
|
{
|
|
$this->msg['error_already_exists'] = 'dkim_already_exists';
|
|
$this->msg['error_does_not_exist'] = 'dkim_does_not_exist';
|
|
$this->msg['confirm_delete'] = 'confirm_delete_dkim';
|
|
|
|
if ($this->new) {
|
|
$this->msg['logname'] = 'create_dkim_entry';
|
|
$this->msg['store_error'] = 'pFetchmail_database_save_error';
|
|
$this->msg['successmessage'] = 'pFetchmail_database_save_success';
|
|
} else {
|
|
$this->msg['logname'] = 'edit_dkim_entry';
|
|
$this->msg['store_error'] = 'pFetchmail_database_save_error';
|
|
$this->msg['successmessage'] = 'pFetchmail_database_save_success';
|
|
}
|
|
}
|
|
|
|
public function webformConfig()
|
|
{
|
|
$required_role = 'global-admin';
|
|
if (Config::bool('dkim_all_admins')) {
|
|
$required_role = 'admin';
|
|
}
|
|
|
|
return array(
|
|
# $PALANG labels
|
|
'formtitle_create' => 'pDkim_new_key',
|
|
'formtitle_edit' => 'pDkim_edit_key',
|
|
'create_button' => 'pFetchmail_new_entry',
|
|
|
|
# various settings
|
|
'required_role' => $required_role,
|
|
'listview' => 'list.php?table=dkim',
|
|
'early_init' => 0,
|
|
);
|
|
}
|
|
protected function validate_new_id()
|
|
{
|
|
# auto_increment - any non-empty ID is an error
|
|
if ($this->id != '') {
|
|
$this->errormsg[$this->id_field] = 'auto_increment value, you must pass an empty string!';
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* @return boolean
|
|
*/
|
|
public function delete()
|
|
{
|
|
if (! $this->view()) {
|
|
$this->errormsg[] = Config::Lang($this->msg['error_does_not_exist']);
|
|
return false;
|
|
}
|
|
|
|
db_delete($this->db_table, $this->id_field, $this->id);
|
|
|
|
db_log($this->result['domain_name'], 'delete_dkim_entry', $this->result['description'] ?? '');
|
|
$this->infomsg[] = Config::Lang_f('pDelete_delete_success', $this->result['label']);
|
|
return true;
|
|
}
|
|
|
|
public function domain_from_id()
|
|
{
|
|
return '';
|
|
}
|
|
}
|
|
|
|
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
|