From 8dfe79afce18c8265489087b2822202b2e1acc70 Mon Sep 17 00:00:00 2001 From: shugo Date: Tue, 24 Aug 2004 08:31:22 +0000 Subject: * lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not use a session id as a filename. (backported from HEAD) * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto. * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use Dir::tmpdir. (backported from HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi/session/pstore.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'lib/cgi/session') diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index f46dd57392..033acc3249 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -31,10 +31,6 @@ class CGI # library file pstore.rb. Session data is marshalled and stored # in a file. File locking and transaction services are provided. class PStore - def check_id(id) #:nodoc: - /[^0-9a-zA-Z]/ =~ id.to_s ? false : true - end - # Create a new CGI::Session::PStore instance # # This constructor is used internally by CGI::Session. The @@ -58,13 +54,12 @@ class CGI # This session's PStore file will be created if it does # not exist, or opened if it does. def initialize session, option={} - dir = option['tmpdir'] || ENV['TMP'] || '/tmp' + dir = option['tmpdir'] || Dir::tmpdir prefix = option['prefix'] || '' id = session.session_id - unless check_id(id) - raise ArgumentError, "session_id `%s' is invalid" % id - end - path = dir+"/"+prefix+id + require 'digest/md5' + md5 = Digest::MD5.hexdigest(id)[0,16] + path = dir+"/"+prefix+md5 path.untaint unless File::exist? path @hash = {} -- cgit v1.2.3