Added config file

Author: abeverley

ADBOS/Auth.pm

@@ -7,6 +7,7 @@ use Apache::Session::File;
 use CGI::Cookie;
 use ADBOS::Display;
 use ADBOS::DB;
+use ADBOS::Config;
 use Crypt::SaltedHash;
 use String::Random;
 use DateTime;
@@ -48,7 +49,8 @@ sub login()
     my $message;
     if($q->body('login')) # Only POST requests
     {
-        my $db = ADBOS::DB->new;
+        my $config = simple_config;
+        my $db = ADBOS::DB->new($config);
         my $user = $db->userGet({ username => $q->param('username') });
         if ($user && Crypt::SaltedHash->validate($user->password, $q->param('password')))
         {

ADBOS/Config.pm

@@ -0,0 +1,58 @@
+use warnings;
+use strict;
+
+package ADBOS::Config;
+use base 'Exporter';
+
+our @EXPORT = qw(simple_config);
+
+sub simple_config
+{   my $fn = shift || '/etc/adbos.conf';
+
+    open CONFIG, '<:encoding(utf8)', $fn
+        or die "cannot read config from $fn";
+
+    my %config;
+    while(<CONFIG>)
+    {   next if m/^#|^\s*$/;
+
+        # as long as the lines contain a trailing \, concat more lines
+        $_ .= <CONFIG> while s/\\$//;
+
+        # remove last new-line
+        chomp;
+
+        # key-value separated by " = " or just blanks
+        my ($key, $value) = split /(?:\s+\=\s+|\s+)/, $_, 2;
+
+        # expands ${SOMETHING} constructs from config or %ENV
+        $value =~ s/\$\{(\w+)\}/expand_var(\%config,$1)/ge;
+
+        # change text "undef" into value undef
+        undef $value if $value eq 'undef';
+
+        if(!$config{$key})
+        {   # key encountered for the first time
+            $config{$key} = $value;
+        }
+        elsif(ref $config{$key} eq 'ARRAY')
+        {   # key already found twice or more often
+            push @{$config{$key}}, $value;
+        }
+        else
+        {   # key found for the second time: upscale to array
+            $config{$key} = [ $config{$key}, $value ];
+        }
+    }
+    close CONFIG
+        or die "read errors for $fn";
+
+    \%config;
+}
+
+sub expand_var($$)
+{   my ($config, $var) = @_;
+    my $val = $config->{$var} // $ENV{$var}
+       or die "expand variable $var not (yet) known";
+    $val;
+}

ADBOS/DB.pm

@@ -24,25 +24,21 @@ OPTIONS:
 =cut
 
 sub new($%)
-{   my ($class, $global_config, %args) = @_;
-#    $config  = $global_config || {};
+{   my ($class, $config) = @_;
     my $self = bless {}, $class;
-#    my ($dbname, $dbuser, $dbpass) = @{$config}{qw/DBNAME DBUSER DBPASS/};
-#    $self->{SB_name} = $args{name}     || $config->{DBNAME};
-#    $self->{SB_user} = $args{user}     || $config->{DBUSER};
-#    $self->{SB_pass} = $args{password} || $config->{DBPASS};
-    $self->{SB_name} = 'opdef';
-    $self->{SB_user} = 'opdef';
-    $self->{SB_pass} = 'cunteryun';
+    $self->{dbhost} = $config->{dbhost} or die 'Need dbhost';
+    $self->{dbname} = $config->{dbname} or die 'Need dbname';
+    $self->{dbuser} = $config->{dbuser} or die 'Need dbuser';
+    $self->{dbpass} = $config->{dbpass} or die 'Need dbpass';
     $self;
 }
 
 sub connect()
 {   my $self   = shift;
-    my $dbname = $self->{SB_name};
+    my $dbname = $self->{dbname};
 
     $self->{sch} = ADBOS::Schema->connect(
-      "dbi:mysql:database=$dbname;host=adbosdb", $self->{SB_user}, $self->{SB_pass}
+      "dbi:mysql:database=$dbname;host=".$self->{dbhost}, $self->{dbuser}, $self->{dbpass}
      , {RaiseError => 1, AutoCommit => 1, mysql_enable_utf8 => 1}
     ) or error __x"unable to connect to database {name}: {err}"
            , name => $dbname, err => $DBI::errstr;

ADBOS/Display.pm

@@ -7,6 +7,7 @@ use Template;
 
 use ADBOS::DB;
 use ADBOS::Parse;
+use ADBOS::Config;
 
 =pod
 
@@ -23,7 +24,8 @@ OPTIONS:
 
 =cut
 
-my $db    = ADBOS::DB->new;
+my $config = simple_config;
+my $db    = ADBOS::DB->new($config);
 
 sub new($$)
 {   my ($class, $q) = @_;

process.pl

@@ -5,12 +5,15 @@
 
 use ADBOS::DB;
 use ADBOS::Parse;
+use ADBOS::Config;
 use File::Slurp;
 
 sub process($;$);
 
+my $config = simple_config;
+
 my $parser = ADBOS::Parse->new();
-my $db     = ADBOS::DB->new();
+my $db     = ADBOS::DB->new($config);
 
 # See if text is being piped in. If so, read it
 if (not -t STDIN and my $message = do { local $/; <STDIN> })

testparse.pl

@@ -9,7 +9,6 @@
 use Data::Dumper;
 
 my $parser = ADBOS::Parse->new();
-my $db     = ADBOS::DB->new();
 
 my $message = do { local $/; <STDIN> };