Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 18:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow validated wizard API commit and return connection id

Browse Source
This commit is contained in:
Terranom674
2026-08-18 08:45:55 +02:00
parent 98a4f49b26
commit e5a03b13bd
1 changed files with 39 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
include/nc_connector_create_api.inc.php
View File

@@ -16,13 +16,9 @@ function bratonien_tools_nc_connector_create_local_api_first()
'nc_activity_view' => 'Activity-View', 'nc_activity_view' => 'Activity-View',
'nc_gallery_root' => 'Galerie-Pfad', 'nc_gallery_root' => 'Galerie-Pfad',
); );
foreach ($required as $field => $label) foreach ($required as $field => $label)
{ {
if (trim((string)($_POST[$field] ?? '')) === '') if (trim((string)($_POST[$field] ?? '')) === '') throw new RuntimeException($label.' fehlt.');
{
throw new RuntimeException($label.' fehlt.');
}
} }
$fallback_user = trim((string)($_POST['nc_piwigo_user'] ?? '')); $fallback_user = trim((string)($_POST['nc_piwigo_user'] ?? ''));
@@ -33,102 +29,67 @@ function bratonien_tools_nc_connector_create_local_api_first()
} }
$api = bratonien_tools_nc_api_credentials(); $api = bratonien_tools_nc_api_credentials();
if (($api['key_id'] ?? '') === '' && $fallback_user === '') $validated_pending_api = (string)($_POST['nc_api_validated'] ?? '') === '1';
if (($api['key_id'] ?? '') === '' && $fallback_user === '' && !$validated_pending_api)
{ {
throw new RuntimeException('Es ist weder ein gespeicherter Piwigo-API-Zugang noch ein Benutzername/Passwort-Fallback vorhanden.'); throw new RuntimeException('Es ist weder ein geprüfter Piwigo-API-Zugang noch ein Benutzername/Passwort-Fallback vorhanden.');
} }
$port = (int)($_POST['nc_port'] ?? 5432); $port = (int)($_POST['nc_port'] ?? 5432);
if ($port < 1 || $port > 65535) if ($port < 1 || $port > 65535) throw new RuntimeException('Ungueltiger PostgreSQL-Port.');
{
throw new RuntimeException('Ungueltiger PostgreSQL-Port.');
}
$gallery_root = rtrim(trim((string)$_POST['nc_gallery_root']), '/'); $gallery_root = rtrim(trim((string)$_POST['nc_gallery_root']), '/');
if (strpos($gallery_root, './') === 0) if (strpos($gallery_root, './') === 0)
{ {
$piwigo_root = realpath(PHPWG_ROOT_PATH); $piwigo_root = realpath(PHPWG_ROOT_PATH);
if ($piwigo_root === false) if ($piwigo_root === false) throw new RuntimeException('Piwigo-Stammverzeichnis konnte nicht aufgelöst werden.');
{
throw new RuntimeException('Piwigo-Stammverzeichnis konnte nicht aufgelöst werden.');
}
$gallery_root = rtrim($piwigo_root, '/').'/'.ltrim(substr($gallery_root, 2), '/'); $gallery_root = rtrim($piwigo_root, '/').'/'.ltrim(substr($gallery_root, 2), '/');
} }
if ($gallery_root === '' || $gallery_root[0] !== '/') if ($gallery_root === '' || $gallery_root[0] !== '/') throw new RuntimeException('Der Galerie-Pfad muss ein absoluter Pfad sein.');
{
throw new RuntimeException('Der Galerie-Pfad muss ein absoluter Pfad sein.');
}
$config = array( $config = array(
'host' => trim((string)$_POST['nc_host']), 'host'=>trim((string)$_POST['nc_host']),
'port' => (string)$port, 'port'=>(string)$port,
'database' => trim((string)$_POST['nc_database']), 'database'=>trim((string)$_POST['nc_database']),
'user' => trim((string)$_POST['nc_user']), 'user'=>trim((string)$_POST['nc_user']),
'source_view' => trim((string)$_POST['nc_source_view']), 'source_view'=>trim((string)$_POST['nc_source_view']),
'activity_view' => trim((string)$_POST['nc_activity_view']), 'activity_view'=>trim((string)$_POST['nc_activity_view']),
'gallery_root' => $gallery_root, 'gallery_root'=>$gallery_root,
'state_dir' => '', 'state_dir'=>'','status_file'=>'',
'status_file' => '', 'quiet_seconds'=>max(0,(int)($_POST['nc_quiet_seconds'] ?? 120)),
'quiet_seconds' => max(0, (int)($_POST['nc_quiet_seconds'] ?? 120)), 'max_wait_seconds'=>max(60,(int)($_POST['nc_max_wait_seconds'] ?? 900)),
'max_wait_seconds' => max(60, (int)($_POST['nc_max_wait_seconds'] ?? 900)), 'full_sync_seconds'=>max(300,(int)($_POST['nc_full_sync_seconds'] ?? 86400)),
'full_sync_seconds' => max(300, (int)($_POST['nc_full_sync_seconds'] ?? 86400)), 'storages'=>bratonien_tools_nc_connector_parse_storages($_POST['nc_storages'] ?? ''),
'storages' => bratonien_tools_nc_connector_parse_storages($_POST['nc_storages'] ?? ''), 'origin'=>'native','piwigo_auth'=>'api-first',
'origin' => 'native',
'piwigo_auth' => 'api-first',
); );
foreach (array('nextcloud_url'=>'nc_nextcloud_url','showcase_user'=>'nc_showcase_user','nextcloud_access_user'=>'nc_access_user','nextcloud_product'=>'nc_product','nextcloud_version'=>'nc_version') as $config_key=>$post_key)
foreach (array(
'nextcloud_url' => 'nc_nextcloud_url',
'showcase_user' => 'nc_showcase_user',
'nextcloud_access_user' => 'nc_access_user',
'nextcloud_product' => 'nc_product',
'nextcloud_version' => 'nc_version',
) as $config_key => $post_key)
{ {
$value = trim((string)($_POST[$post_key] ?? '')); $value=trim((string)($_POST[$post_key] ?? '')); if($value!=='') $config[$config_key]=$value;
if ($value !== '')
{
$config[$config_key] = $value;
}
} }
bratonien_tools_nc_connector_view_name($config['source_view']); bratonien_tools_nc_connector_view_name($config['source_view']);
bratonien_tools_nc_connector_view_name($config['activity_view']); bratonien_tools_nc_connector_view_name($config['activity_view']);
$table = bratonien_tools_nc_connector_table(); $table=bratonien_tools_nc_connector_table(); bratonien_tools_nc_connector_ensure_table(); $now=date('Y-m-d H:i:s');
bratonien_tools_nc_connector_ensure_table(); $connection_key='local-'.bin2hex(random_bytes(12));
$now = date('Y-m-d H:i:s'); $secret_blob=bratonien_tools_nc_connector_encrypt_credentials((string)$_POST['nc_db_password'],$fallback_user,$fallback_password);
$connection_key = 'local-'.bin2hex(random_bytes(12)); $config_json=json_encode($config,JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
$secret_blob = bratonien_tools_nc_connector_encrypt_credentials( if(!is_string($config_json)) throw new RuntimeException('Connector-Konfiguration konnte nicht serialisiert werden.');
(string)$_POST['nc_db_password'],
$fallback_user, pwg_query("INSERT INTO `$table` (connection_key, name, adapter, enabled, takeover_state, config_json, secret_blob, created, updated) VALUES ('".pwg_db_real_escape_string($connection_key)."','".pwg_db_real_escape_string(trim((string)$_POST['nc_name']))."','local',0,'disabled','".pwg_db_real_escape_string($config_json)."','".pwg_db_real_escape_string($secret_blob)."','".pwg_db_real_escape_string($now)."','".pwg_db_real_escape_string($now)."')");
$fallback_password $id=(int)pwg_db_insert_id();
); if($id<1) throw new RuntimeException('Die Connector-Verbindung konnte nicht eindeutig angelegt werden.');
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); $config['state_dir']='/var/lib/bratonien-tools/nc-connector/connection-'.$id;
if (!is_string($config_json)) $config['status_file']=$config['state_dir'].'/connector-status.json';
$config_json=json_encode($config,JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
if(!is_string($config_json))
{ {
throw new RuntimeException('Connector-Konfiguration konnte nicht serialisiert werden.'); pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
throw new RuntimeException('Connector-Konfiguration konnte nach dem Anlegen nicht serialisiert werden.');
} }
pwg_query("INSERT INTO `$table`
(connection_key, name, adapter, enabled, takeover_state, config_json, secret_blob, created, updated)
VALUES ('".pwg_db_real_escape_string($connection_key)."',
'".pwg_db_real_escape_string(trim((string)$_POST['nc_name']))."',
'local', 0, 'disabled',
'".pwg_db_real_escape_string($config_json)."',
'".pwg_db_real_escape_string($secret_blob)."',
'".pwg_db_real_escape_string($now)."',
'".pwg_db_real_escape_string($now)."')");
$id = (int)pwg_db_insert_id();
$config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
$config['status_file'] = $config['state_dir'].'/connector-status.json';
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id); pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id);
return array( return array(
'message' => $fallback_user === '' 'connection_id'=>$id,
? 'Nextcloud-Verbindung wurde API-first ohne dauerhaft gespeicherten Benutzername/Passwort-Fallback angelegt. Bitte technisch pruefen und danach im LXC aktivieren.' 'message'=>$fallback_user==='' ? 'Nextcloud-Verbindung wurde API-first ohne dauerhaft gespeicherten Benutzername/Passwort-Fallback angelegt. Bitte technisch pruefen und danach im LXC aktivieren.' : 'Nextcloud-Verbindung wurde API-first mit verschluesseltem Benutzername/Passwort-Fallback angelegt. Bitte technisch pruefen und danach im LXC aktivieren.'
: 'Nextcloud-Verbindung wurde API-first mit verschluesseltem Benutzername/Passwort-Fallback angelegt. Bitte technisch pruefen und danach im LXC aktivieren.'
); );
} }