[pmg-devel] [PATCH pmg-api 1/3] auth: plugin: move schema definitions from Utils to Auth::Plugin

[Stoiko Ivanov <s.ivanov@proxmox.com>]

it's the class that actually needs them, and where we want
to keep the definitions.

move happens in order to not have a cyclical include
(PMG::Auth::Plugin including PMG::Utils for the schema definitions,
and PMG::Utils including PMG::Auth::Plugin to get the realms from its
config file).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 src/PMG/Auth/Plugin.pm | 19 ++++++++++++++++++-
 src/PMG/Utils.pm       | 21 ++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/PMG/Auth/Plugin.pm b/src/PMG/Auth/Plugin.pm
index beb8fc4..f6792ac 100755
--- a/src/PMG/Auth/Plugin.pm
+++ b/src/PMG/Auth/Plugin.pm
@@ -6,7 +6,6 @@ use warnings;
 use Digest::SHA;
 use Encode;
 
-use PMG::Utils;
 use PVE::INotify;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::SectionConfig;
@@ -56,6 +55,24 @@ sub lock_realm_config {
     }
 }
 
+sub is_valid_realm {
+    my ($realm) = @_;
+    return 0 if !$realm;
+    return 1 if $realm eq 'pam' || $realm eq 'quarantine'; # built-in ones
+
+    my $cfg = PVE::INotify::read_file(PMG::Auth::Plugin::realm_conf_id());
+    return exists($cfg->{ids}->{$realm}) ? 1 : 0;
+}
+
+PVE::JSONSchema::register_format('pmg-realm', \&is_valid_realm);
+
+PVE::JSONSchema::register_standard_option('realm', {
+    description => "Authentication domain ID",
+    type => 'string',
+    format => 'pmg-realm',
+    maxLength => 32,
+});
+
 my $realm_regex = qr/[A-Za-z][A-Za-z0-9\.\-_]+/;
 
 sub pmg_verify_realm {
diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index d440876..33f80ae 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -34,6 +34,7 @@ use Time::Local;
 use Xdgmime;
 
 use PMG::AtomicFile;
+use PMG::Auth::Plugin;
 use PMG::MIMEUtils;
 use PMG::MailQueue;
 use PMG::SMTPPrinter;
@@ -52,30 +53,12 @@ try_decode_utf8
 my $user_regex = qr![^\s:/]+!;
 
 sub valid_pmg_realm_regex {
-    my $cfg = PVE::INotify::read_file('realms.cfg');
+    my $cfg = PVE::INotify::read_file(PMG::Auth::Plugin::realm_conf_id());
     my $ids = $cfg->{ids};
     my $realms = ['pam', 'quarantine', sort keys $cfg->{ids}->%* ];
     return join('|', @$realms);
 }
 
-sub is_valid_realm {
-    my ($realm) = @_;
-    return 0 if !$realm;
-    return 1 if $realm eq 'pam' || $realm eq 'quarantine'; # built-in ones
-
-    my $cfg = PVE::INotify::read_file('realms.cfg');
-    return exists($cfg->{ids}->{$realm}) ? 1 : 0;
-}
-
-PVE::JSONSchema::register_format('pmg-realm', \&is_valid_realm);
-
-PVE::JSONSchema::register_standard_option('realm', {
-    description => "Authentication domain ID",
-    type => 'string',
-    format => 'pmg-realm',
-    maxLength => 32,
-});
-
 PVE::JSONSchema::register_standard_option('pmg-starttime', {
     description => "Only consider entries newer than 'starttime' (unix epoch). Default is 'now - 1day'.",
     type => 'integer',
-- 
2.39.5



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel