force utf-8 for free ipa remote user headers

radiorabe · May 31, 2017 · 82de4af · 82de4af
1 parent 3156429
commit 82de4af
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/controllers/auth/remote_header.rb b/app/controllers/auth/remote_header.rb
@@ -27,6 +27,7 @@ def remote_user_params
        h['REMOTE_USER_GROUPS'],
        h['REMOTE_USER_FIRST_NAME'],
        h['REMOTE_USER_LAST_NAME']]
+        .map { |str| str && str.force_encoding('UTF-8') }
     end
 
   end

diff --git a/config/initializers/callback_terminator.rb b/config/initializers/callback_terminator.rb
diff --git a/config/secrets.yml b/config/secrets.yml
@@ -39,7 +39,7 @@ test:
   ssl: false
   host_name: example.com
   base_path:
-  admin_groups: 'admin, root'
+  admin_groups: 'admins, root'
   days_to_expire_api_key:
   minutes_to_expire_jwt_token: 60
 

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
@@ -16,7 +16,7 @@
 admin:
   username: admin
   api_key: <%= SecureRandom.base58(24) %>
-  groups: admin, grooveexpress
+  groups: admins, grooveexpress
 
 speedee:
   username: speedee

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -31,7 +31,7 @@ class UserTest < ActiveSupport::TestCase
 
   test '#admin? is true if all groups are present' do
     user = users(:admin)
-    user.groups = 'root, admin'
+    user.groups = 'root, admins'
     assert user.admin?
   end
 
@@ -49,7 +49,7 @@ class UserTest < ActiveSupport::TestCase
 
   test '#group_list returns array' do
     user = users(:admin)
-    assert_equal %w(admin grooveexpress), user.group_list
+    assert_equal %w(admins grooveexpress), user.group_list
   end
 
   test '#groups= serializes arrays' do