Changeset 248

Timestamp:

12/31/10 12:04:39 (13 years ago)

Author:

nanardon

Message:

• don't hardcode admin password in admin tools (it has been changed)

Location:

server/trunk/admin

Files:

• bin/sophie_admin (modified) (2 diffs)
• bin/sophie_dump (added)
• bin/sophie_load (added)
• lib/Sophie/Cli.pm (modified) (2 diffs)

server/trunk/admin/bin/sophie_admin

@@ -5 +5 @@
 require RPC::XML::Client;
 use Getopt::Long;
+use Term::ReadKey;
 
 GetOptions(
@@ -10 +11 @@
 ) or die "Wrong options";
 
-require Data::Dumper;
-my $xmlcli = RPC::XML::Client->new($server || 'http://127.0.0.1:3000/rpc');
+ReadMode('noecho');
+print "Enter password: ";
+my $password = ReadLine(0);
+ReadMode 0;
+print "\n";
+chomp($password);
 
-my $res = $xmlcli->send_request('login', 'admin', 'toto');
+my $xmlcli = RPC::XML::Client->new($server || 'http://sophie.zarb.org/rpc');
+
+my $res = $xmlcli->send_request('login', 'admin', $password);
 if (ref $res) {
     $xmlcli->request->header('cookie', $$res);

server/trunk/admin/lib/Sophie/Cli.pm

@@ -192 +192 @@
     my $env = __PACKAGE__->new({}, $base);
 
+    $env->add_func('list_user',
+        {
+            code => sub {
+                my ($self, $match) = @_;
+                my $res = $self->xmlreq('admin.list_user', $match);
+                if ($res) {
+                    print $OUT (map { "$_\n" } @{ $res->value });
+                }
+            }
+        }
+    );
+    $env->add_func('delete_user',
+        {
+            code => sub {
+                my ($self, $match) = @_;
+                my $res = $self->xmlreq('admin.delete_user', $match);
+                if ($res) {
+                    print $OUT $res->value . "\n";
+                }
+            },
+            completion => sub {
+                my ($self, undef, @args) = @_;
+                my $res = $self->xmlreq(
+                    'admin.list_user');
+                return @{$res->value};
+            },
+        }
+    );
+    $env->add_func('set_password',
+        {
+            code => sub {
+                my ($self, $match, $password) = @_;
+                my $res = $self->xmlreq('admin.set_user_password', $match,
+                    $password);
+                if ($res) {
+                    print $OUT $res->value . "\n";
+                }
+            },
+            completion => sub {
+                my ($self, undef, $user) = @_;
+                if (!$user) {
+                my $res = $self->xmlreq(
+                    'admin.list_user');
+                return @{$res->value};
+                } else { return }
+            },
+        }
+    );
     $env->add_func('create_user',
         {
@@ -217 +265 @@
                 my $res = $self->xmlreq(
                     'distrib.list', @args);
-                return  map { $_ } @{$res->value};
+                return @{$res->value};
             },
         },