Fix #36821: Allow to customize maximum lenght of a login indentifier

[shogi-server/shogi-server.git] / shogi_server / login.rb

diff --git a/shogi_server/login.rb b/shogi_server/login.rb
index 79e770e..38866d4 100644 (file)
--- a/shogi_server/login.rb
+++ b/shogi_server/login.rb
@@ -38,7 +38,7 @@ class Login
   end
 
   def Login.good_game_name?(str)
-    if ((str =~ /^(.+)-\d+-\d+$/) && (good_identifier?($1)))
+    if ((str =~ /^(.+)-\d+-\d+F?$/) && (good_identifier?($1)))
       return true
     else
       return false
@@ -79,7 +79,8 @@ class Login
   end
 
   def Login.good_identifier?(str)
-    if str =~ /\A[\w@\-\.]{1,#{Max_Identifier_Length}}\z/
+    max = $options["max-identifier"]
+    if str =~ /\A[\w@\-\.]{1,#{max}}\z/
       return true
     else
       return false
@@ -87,7 +88,7 @@ class Login
   end
 
   def Login.factory(str, player)
-    (login, player.name, password, ext) = str.chomp.split
+    (_, player.name, password, ext) = str.chomp.split
     if ext
       return Loginx1.new(player, password)
     else
@@ -109,7 +110,8 @@ class Login
 
   def process
     @player.write_safe(sprintf("LOGIN:%s OK\n", @player.name))
-    log_message(sprintf("user %s run in %s mode", @player.name, @player.protocol))
+    log_message("user %s run in %s mode" % [(@player.rated? ? @player.player_id : @player.name),
+                                            @player.protocol])
   end
 
   def incorrect_duplicated_player(str)
@@ -148,7 +150,7 @@ class LoginCSA < Login
   # turn character "+" or "-"; false otherwise
   #
   def parse_gamename_turn(str)
-    if str =~ /^(.+)-\d+-\d+-(\w)$/
+    if str =~ /^(.+)-\d+-\d+F?-(\w)$/
       case $2
       when "b","B"
         return [str[0, str.length-2], "+"]