Item12180: Encode wide characters in PASSWORDs

git-svn-id: http://svn.foswiki.org/trunk@16330 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

core/lib/Foswiki/Configure/Types/PASSWORD.pm

@@ -41,9 +41,27 @@ sub value2string {
 
     $_[2] = '*' x 15;
 
-    my $txt = Data::Dumper->Dump( [ encode_base64( $value, '' ) ] );
+    use bytes();
+    my $txt;
+
+    # base64 is undefined for wide characters.
+    # If wide characters are present, Encode into octects first
+
+    if ( length($value) < bytes::length($value) ) {
+        require Encode;
+
+        $txt = Data::Dumper->Dump(
+            [ encode_base64( Encode::encode_utf8($value), '' ) ] );
+        $txt =~
+s/VAR1\s+=\s+(.*?);\n/Foswiki::cfg$keys = Encode::decode_utf8(MIME::Base64::decode_base64($1));\n/ms;
+        return ( $txt, [qw/MIME::Base64 Encode/] );
+    }
+
+    # No wide characters, use simpler encoding
+
+    $txt = Data::Dumper->Dump( [ encode_base64( $value, '' ) ] );
     $txt =~
-s/VAR1\s+=\s+(.*?);\n/Foswiki::cfg$keys = MIME::Base64::decode_base64( $1 );\n/ms;
+s/VAR1\s+=\s+(.*?);\n/Foswiki::cfg$keys = MIME::Base64::decode_base64($1);\n/ms;
 
     return ( $txt, 'MIME::Base64' );
 }