|
|
@ -2,26 +2,8 @@ |
|
|
|
my $rec = $DB->get('mozilla-sync') |
|
|
|
my $rec = $DB->get('mozilla-sync') |
|
|
|
|| $DB->new_record('mozilla-sync', {type => 'service'}); |
|
|
|
|| $DB->new_record('mozilla-sync', {type => 'service'}); |
|
|
|
my $pw = $rec->prop('DbPassword'); |
|
|
|
my $pw = $rec->prop('DbPassword'); |
|
|
|
if (not $pw or length($pw) < 57){ |
|
|
|
if (not $pw){ |
|
|
|
use MIME::Base64 qw(encode_base64); |
|
|
|
$pw=`/usr/bin/openssl rand -base64 15 | tr -c -d '[:graph:]'`; |
|
|
|
|
|
|
|
|
|
|
|
$pw = "not set due to error"; |
|
|
|
|
|
|
|
if ( open( RANDOM, "/dev/urandom" ) ){ |
|
|
|
|
|
|
|
my $buf; |
|
|
|
|
|
|
|
# 57 bytes is a full line of Base64 coding, and contains |
|
|
|
|
|
|
|
# 456 bits of randomness - given a perfectly random /dev/random |
|
|
|
|
|
|
|
if ( read( RANDOM, $buf, 57 ) != 57 ){ |
|
|
|
|
|
|
|
warn("Short read from /dev/random: $!"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else{ |
|
|
|
|
|
|
|
$pw = encode_base64($buf); |
|
|
|
|
|
|
|
chomp $pw; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
close RANDOM; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else{ |
|
|
|
|
|
|
|
warn "Could not open /dev/urandom: $!"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
$rec->set_prop('DbPassword', $pw); |
|
|
|
$rec->set_prop('DbPassword', $pw); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|