Commit b9b3ec83 authored by Imre Farkas's avatar Imre Farkas

CE port of "Require session with smartcard login for Git access"

parent f845a081
......@@ -4,19 +4,24 @@ module Gitlab
class NamespacedSessionStore
delegate :[], :[]=, to: :store
def initialize(key)
def initialize(key, session = Session.current)
@key = key
@session = session
end
def initiated?
!Session.current.nil?
!session.nil?
end
def store
return unless Session.current
return unless session
Session.current[@key] ||= {}
Session.current[@key]
session[@key] ||= {}
session[@key]
end
private
attr_reader :session
end
end
......@@ -4,19 +4,33 @@ require 'spec_helper'
describe Gitlab::NamespacedSessionStore do
let(:key) { :some_key }
subject { described_class.new(key) }
it 'stores data under the specified key' do
Gitlab::Session.with_session({}) do
subject[:new_data] = 123
context 'current session' do
subject { described_class.new(key) }
expect(Thread.current[:session_storage][key]).to eq(new_data: 123)
it 'stores data under the specified key' do
Gitlab::Session.with_session({}) do
subject[:new_data] = 123
expect(Thread.current[:session_storage][key]).to eq(new_data: 123)
end
end
it 'retrieves data from the given key' do
Thread.current[:session_storage] = { key => { existing_data: 123 } }
expect(subject[:existing_data]).to eq 123
end
end
it 'retrieves data from the given key' do
Thread.current[:session_storage] = { key => { existing_data: 123 } }
context 'passed in session' do
let(:data) { { 'data' => 42 } }
let(:session) { { 'some_key' => data } }
subject { described_class.new(key, session.with_indifferent_access) }
expect(subject[:existing_data]).to eq 123
it 'retrieves data from the given key' do
expect(subject['data']).to eq 42
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment