Changeset 482

Timestamp:

04/02/06 07:19:58

Author:

miyagawa

Message:

Auto-rewrite config if encrypted fields are found. Fixes #91

Files:

• trunk/plagger/lib/Plagger.pm (modified) (5 diffs)
• trunk/plagger/lib/Plagger/Plugin.pm (modified) (3 diffs)
• trunk/plagger/lib/Plagger/Plugin/Subscription/Bloglines.pm (modified) (1 diff)

trunk/plagger/lib/Plagger.pm

@@ -6 +6 @@
-use Carp;
-use Data::Dumper;
+use File::Copy;
-use File::Basename;
-use File::Find::Rule;
@@ -12 +13 @@
-
-use base qw( Class::Accessor::Fast );
-
+ 
-
-use Plagger::Cache;
@@ -40 +41 @@
-        plugins_path => {},
-        plugins => [],
+        rewrite_tasks => []
-    }, $class;
-
@@ -48 +50 @@
-        $self->{conf} = $config->{global};
-        $self->{conf}->{log}   ||= { level => 'debug' };
+        $self->{config_path} = $opt{config};
-    } else {
-        croak "Plagger->bootstrap: $opt{config}: $!";
@@ -57 +60 @@
-    $self->load_cache($opt{config});
-    $self->load_plugins(@{ $config->{plugins} || [] });
+    $self->rewrite_config if @{ $self->{rewrite_tasks} };
-    $self->run();
+}
+
+sub add_rewrite_task {
+    my($self, @stuff) = @_;
+    push @{ $self->{rewrite_tasks} }, \@stuff;
+}
+
+sub rewrite_config {
+    my $self = shift;
+
+    open my $fh, $self->{config_path} or $self->error("$self->{config_path}: $!");
+    my $data = join '', <$fh>;
+    close $fh;
+
+    my $old = $data;
+    my $count;
+
+    # xxx this is a quick hack: It should be a YAML roundtrip maybe
+    for my $task (@{ $self->{rewrite_tasks} }) {
+        my($key, $old_value, $new_value ) = @$task;
+        if ($data =~ s/^(\s+$key:\s+)$old_value\s*$/$1$new_value/m) {
+            $count++;
+        } else {
+            $self->log(error => "$key: $old_value not found in $self->{config_path}");
+        }
+    }
+
+    if ($count) {
+        File::Copy::copy( $self->{config_path}, $self->{config_path} . ".bak" );
+        open my $fh, ">", $self->{config_path} or $self->error("$self->{config_path}: $!");
+        print $fh $data;
+        close $fh;
+
+        $self->log(info => "rewrote $self->{config_path} with encrypting $count config values");
+    }
-}
-

trunk/plagger/lib/Plagger/Plugin.pm

@@ -5 +5 @@
-__PACKAGE__->mk_accessors( qw(conf rule rule_hook cache) );
-
+use Plagger::Crypt;
-use Plagger::Rule;
-use Plagger::Rules;
@@ -26 +27 @@
-sub init {
-    my $self = shift;
+
-    if (my $rule = $self->{rule}) {
-        $rule = [ $rule ] if ref($rule) eq 'HASH';
@@ -33 +35 @@
-        $self->{rule} = Plagger::Rule->new({ module => 'Always' });
-    }
+
+    if (my $params = $self->encrypt_config) {
+        $params = [ $params ] unless ref $params;
+
+        for my $key (@$params) {
+            my $config = $self->conf;
+            # support foo/bar/baz
+            while ($key =~ s!^(\w+)/!!) {
+                $config = $config->{$1};
+            }
+            my $decrypted = Plagger::Crypt->decrypt($config->{$key});
+            if ($decrypted eq $config->{$key}) {
+                Plagger->context->add_rewrite_task($key, $decrypted, Plagger::Crypt->encrypt($decrypted, 'base64'));
+            } else {
+                $config->{$key} = $decrypted;
+            }
+        }
+    }
-}
+
+sub encrypt_config { }
-
-sub conf { $_[0]->{conf} }

trunk/plagger/lib/Plagger/Plugin/Subscription/Bloglines.pm

@@ -10 +10 @@
-    $self->class_id . '-' . $self->conf->{username};
-}
+
+sub encrypt_config { 'password' }
-
-sub register {