Download as
Browse Code »

Commit 7ee602662bcede021d8a16b2fd76ba9b408291b2

Authored by Matheus de Sousa Faria
1 parent 38397dbe
Exists in master

omniauth-env applyed

Showing 10 changed files with 207 additions and 149 deletions   Show diff stats
Gemfile
  Diff comments   View file @7ee6026
... ... @@ -133,6 +133,7 @@ gem "underscore-rails", "~> 1.4.4"
133 133  
134 134 # Sanitize user input
135 135 gem "sanitize"
  136 +gem "omniauth-env", git: "https://github.com/colab-community/omniauth-env.git"
136 137  
137 138 # Protect against bruteforcing
138 139 gem "rack-attack"
... ...
Gemfile.lock
  Diff comments   View file @7ee6026
  1 +GIT
  2 + remote: https://github.com/colab-community/omniauth-env.git
  3 + revision: 3bdf3750a81f260063c3470ccc0d86070d01c552
  4 + specs:
  5 + omniauth-env (0.0.1)
  6 + gitlab_omniauth-ldap (~> 1.0.3)
  7 + omniauth (~> 1.0)
  8 +
1 9 GEM
2 10 remote: https://rubygems.org/
3 11 specs:
4   - actionmailer (4.0.2)
5   - actionpack (= 4.0.2)
  12 + actionmailer (4.0.4)
  13 + actionpack (= 4.0.4)
6 14 mail (~> 2.5.4)
7   - actionpack (4.0.2)
8   - activesupport (= 4.0.2)
  15 + actionpack (4.0.4)
  16 + activesupport (= 4.0.4)
9 17 builder (~> 3.1.0)
10 18 erubis (~> 2.7.0)
11 19 rack (~> 1.5.2)
12 20 rack-test (~> 0.6.2)
13   - actionpack-action_caching (1.1.0)
  21 + actionpack-action_caching (1.1.1)
14 22 actionpack (>= 4.0.0, < 5.0)
15 23 actionpack-page_caching (1.0.2)
16 24 actionpack (>= 4.0.0, < 5)
17   - activemodel (4.0.2)
18   - activesupport (= 4.0.2)
  25 + activemodel (4.0.4)
  26 + activesupport (= 4.0.4)
19 27 builder (~> 3.1.0)
20   - activerecord (4.0.2)
21   - activemodel (= 4.0.2)
  28 + activerecord (4.0.4)
  29 + activemodel (= 4.0.4)
22 30 activerecord-deprecated_finders (~> 1.0.2)
23   - activesupport (= 4.0.2)
  31 + activesupport (= 4.0.4)
24 32 arel (~> 4.0.0)
25 33 activerecord-deprecated_finders (1.0.3)
26   - activesupport (4.0.2)
27   - i18n (~> 0.6, >= 0.6.4)
  34 + activesupport (4.0.4)
  35 + i18n (~> 0.6, >= 0.6.9)
28 36 minitest (~> 4.2)
29 37 multi_json (~> 1.3)
30 38 thread_safe (~> 0.1)
31 39 tzinfo (~> 0.3.37)
32   - acts-as-taggable-on (2.4.1)
33   - rails (>= 3, < 5)
34   - addressable (2.3.5)
35   - annotate (2.6.0)
  40 + acts-as-taggable-on (3.1.0)
  41 + actionpack (>= 3, < 5)
  42 + activerecord (>= 3, < 5)
  43 + activesupport (>= 3, < 5)
  44 + addressable (2.3.6)
  45 + annotate (2.6.2)
36 46 activerecord (>= 2.3.0)
37 47 rake (>= 0.8.7)
38   - arel (4.0.1)
  48 + arel (4.0.2)
39 49 asciidoctor (0.1.4)
40   - atomic (1.1.14)
  50 + atomic (1.1.16)
41 51 awesome_print (1.2.0)
42   - axiom-types (0.0.5)
43   - descendants_tracker (~> 0.0.1)
44   - ice_nine (~> 0.9)
45   - bcrypt-ruby (3.1.2)
46   - better_errors (1.0.1)
  52 + axiom-types (0.1.1)
  53 + descendants_tracker (~> 0.0.4)
  54 + ice_nine (~> 0.11.0)
  55 + thread_safe (~> 0.3, >= 0.3.1)
  56 + bcrypt (3.1.7)
  57 + bcrypt-ruby (3.1.5)
  58 + bcrypt (>= 3.1.3)
  59 + better_errors (1.1.0)
47 60 coderay (>= 1.0.0)
48 61 erubis (>= 2.6.6)
49 62 binding_of_caller (0.7.2)
... ... @@ -57,21 +70,25 @@ GEM
57 70 rack (>= 1.0.0)
58 71 rack-test (>= 0.5.4)
59 72 xpath (~> 2.0)
60   - carrierwave (0.9.0)
  73 + carrierwave (0.10.0)
61 74 activemodel (>= 3.2.0)
62 75 activesupport (>= 3.2.0)
63 76 json (>= 1.7)
  77 + mime-types (>= 1.16)
64 78 celluloid (0.15.2)
65 79 timers (~> 1.1.0)
  80 + celluloid-io (0.15.0)
  81 + celluloid (>= 0.15.0)
  82 + nio4r (>= 0.5.0)
66 83 charlock_holmes (0.6.9.4)
67 84 chosen-rails (1.0.1)
68 85 coffee-rails (>= 3.2)
69 86 compass-rails (>= 1.0)
70 87 railties (>= 3.0)
71 88 sass-rails (>= 3.2)
72   - chunky_png (1.2.9)
  89 + chunky_png (1.3.0)
73 90 cliver (0.2.2)
74   - code_analyzer (0.4.3)
  91 + code_analyzer (0.4.5)
75 92 sexp_processor
76 93 coderay (1.1.0)
77 94 coercible (1.0.0)
... ... @@ -82,30 +99,32 @@ GEM
82 99 coffee-script (2.2.0)
83 100 coffee-script-source
84 101 execjs
85   - coffee-script-source (1.6.3)
  102 + coffee-script-source (1.7.0)
86 103 colored (1.2)
87 104 colorize (0.5.8)
88   - compass (0.12.2)
  105 + compass (0.12.4)
89 106 chunky_png (~> 1.2)
90 107 fssm (>= 0.2.7)
91   - sass (~> 3.1)
92   - compass-rails (1.1.1)
  108 + sass (~> 3.2.17)
  109 + compass-rails (1.1.7)
93 110 compass (>= 0.12.2)
94   - connection_pool (1.2.0)
  111 + sprockets (<= 2.11.0)
  112 + connection_pool (2.0.0)
95 113 coveralls (0.7.0)
96 114 multi_json (~> 1.3)
97 115 rest-client
98 116 simplecov (>= 0.7)
99 117 term-ansicolor
100 118 thor
101   - crack (0.4.1)
102   - safe_yaml (~> 0.9.0)
  119 + crack (0.4.2)
  120 + safe_yaml (~> 1.0.0)
103 121 d3_rails (3.1.10)
104 122 railties (>= 3.1.0)
105 123 daemons (1.1.9)
106 124 database_cleaner (1.2.0)
107 125 debug_inspector (0.0.2)
108   - descendants_tracker (0.0.3)
  126 + descendants_tracker (0.0.4)
  127 + thread_safe (~> 0.3, >= 0.3.1)
109 128 devise (3.0.4)
110 129 bcrypt-ruby (~> 3.0)
111 130 orm_adapter (~> 0.1)
... ... @@ -114,29 +133,29 @@ GEM
114 133 devise-async (0.8.0)
115 134 devise (>= 2.2, < 3.2)
116 135 diff-lcs (1.2.5)
117   - docile (1.1.1)
118   - dotenv (0.9.0)
  136 + docile (1.1.3)
  137 + dotenv (0.10.0)
119 138 email_spec (1.5.0)
120 139 launchy (~> 2.1)
121 140 mail (~> 2.2)
122   - enumerize (0.7.0)
  141 + enumerize (0.8.0)
123 142 activesupport (>= 3.2)
124   - equalizer (0.0.8)
  143 + equalizer (0.0.9)
125 144 erubis (2.7.0)
126 145 escape_utils (0.2.4)
127 146 eventmachine (1.0.3)
128 147 excon (0.13.4)
129 148 execjs (2.0.2)
130   - factory_girl (4.3.0)
  149 + factory_girl (4.4.0)
131 150 activesupport (>= 3.0.0)
132   - factory_girl_rails (4.3.0)
133   - factory_girl (~> 4.3.0)
  151 + factory_girl_rails (4.4.1)
  152 + factory_girl (~> 4.4.0)
134 153 railties (>= 3.0.0)
135   - faraday (0.8.8)
  154 + faraday (0.8.9)
136 155 multipart-post (~> 1.2.0)
137 156 faraday_middleware (0.9.0)
138 157 faraday (>= 0.7.4, < 0.9)
139   - ffaker (1.22.1)
  158 + ffaker (1.23.0)
140 159 ffi (1.9.3)
141 160 fog (1.3.1)
142 161 builder
... ... @@ -173,7 +192,7 @@ GEM
173 192 stringex (~> 1.5.1)
174 193 gitlab-grack (2.0.0.pre)
175 194 rack (~> 1.5.1)
176   - gitlab-grit (2.6.3)
  195 + gitlab-grit (2.6.4)
177 196 charlock_holmes (~> 0.6.9)
178 197 diff-lcs (~> 1.1)
179 198 mime-types (~> 1.15)
... ... @@ -186,7 +205,7 @@ GEM
186 205 gitlab-pygments.rb (0.5.4)
187 206 posix-spawn (~> 0.3.6)
188 207 yajl-ruby (~> 1.1.0)
189   - gitlab_git (4.0.0.pre)
  208 + gitlab_git (4.0.0)
190 209 activesupport (~> 4.0.0)
191 210 gitlab-grit (~> 2.6.1)
192 211 gitlab-linguist (~> 2.9.5)
... ... @@ -197,7 +216,7 @@ GEM
197 216 omniauth (~> 1.0)
198 217 pyu-ruby-sasl (~> 0.0.3.1)
199 218 rubyntlm (~> 0.1.1)
200   - gon (5.0.0)
  219 + gon (5.0.4)
201 220 actionpack (>= 2.3.0)
202 221 json
203 222 grape (0.6.1)
... ... @@ -214,70 +233,71 @@ GEM
214 233 activesupport
215 234 multi_json (>= 1.3.2)
216 235 growl (1.0.3)
217   - guard (2.2.4)
  236 + guard (2.6.0)
218 237 formatador (>= 0.2.4)
219   - listen (~> 2.1)
  238 + listen (~> 2.7)
220 239 lumberjack (~> 1.0)
221 240 pry (>= 0.9.12)
222 241 thor (>= 0.18.1)
223   - guard-rspec (4.2.0)
224   - guard (>= 2.1.1)
  242 + guard-rspec (4.2.8)
  243 + guard (~> 2.1)
225 244 rspec (>= 2.14, < 4.0)
226   - guard-spinach (0.0.2)
  245 + guard-spinach (0.0.3)
227 246 guard (>= 1.1)
228 247 spinach
229   - haml (4.0.4)
  248 + haml (4.0.5)
230 249 tilt
231   - haml-rails (0.5.1)
232   - actionpack (~> 4.0.0)
233   - activesupport (~> 4.0.0)
  250 + haml-rails (0.5.3)
  251 + actionpack (>= 4.0.1)
  252 + activesupport (>= 4.0.1)
234 253 haml (>= 3.1, < 5.0)
235   - railties (~> 4.0.0)
  254 + railties (>= 4.0.1)
236 255 hashie (2.0.5)
237 256 hike (1.2.3)
238 257 hipchat (0.9.0)
239 258 httparty
240 259 httparty
241 260 http_parser.rb (0.5.3)
242   - httparty (0.12.0)
  261 + httparty (0.13.0)
243 262 json (~> 1.8)
244 263 multi_xml (>= 0.5.2)
245   - httpauth (0.2.0)
  264 + httpauth (0.2.1)
246 265 i18n (0.6.9)
247   - ice_nine (0.10.0)
  266 + ice_nine (0.11.0)
248 267 jasmine (2.0.0.rc5)
249 268 jasmine-core (~> 2.0.0.rc5)
250 269 phantomjs
251 270 rack (>= 1.2.1)
252 271 rake
253   - jasmine-core (2.0.0.rc5)
  272 + jasmine-core (2.0.0)
254 273 jquery-atwho-rails (0.3.3)
255 274 jquery-rails (2.1.3)
256 275 railties (>= 3.1.0, < 5.0)
257 276 thor (~> 0.14)
258   - jquery-turbolinks (2.0.1)
  277 + jquery-turbolinks (2.0.2)
259 278 railties (>= 3.1.0)
260 279 turbolinks
261 280 jquery-ui-rails (2.0.2)
262 281 jquery-rails
263 282 railties (>= 3.1.0)
264 283 json (1.8.1)
265   - jwt (0.1.8)
  284 + jwt (0.1.11)
266 285 multi_json (>= 1.5)
267 286 kaminari (0.14.1)
268 287 actionpack (>= 3.0.0)
269 288 activesupport (>= 3.0.0)
270   - kgio (2.8.1)
  289 + kgio (2.9.2)
271 290 launchy (2.4.2)
272 291 addressable (~> 2.3)
273   - letter_opener (1.1.2)
  292 + letter_opener (1.2.0)
274 293 launchy (~> 2.2)
275 294 libv8 (3.16.14.3)
276   - listen (2.3.1)
  295 + listen (2.7.1)
277 296 celluloid (>= 0.15.2)
  297 + celluloid-io (>= 0.15.0)
278 298 rb-fsevent (>= 0.9.3)
279 299 rb-inotify (>= 0.9)
280   - lumberjack (1.0.4)
  300 + lumberjack (1.0.5)
281 301 mail (2.5.4)
282 302 mime-types (~> 1.16)
283 303 treetop (~> 1.4.8)
... ... @@ -286,15 +306,16 @@ GEM
286 306 minitest (4.7.5)
287 307 modernizr (2.6.2)
288 308 sprockets (~> 2.0)
289   - multi_json (1.8.2)
  309 + multi_json (1.9.2)
290 310 multi_xml (0.5.5)
291 311 multipart-post (1.2.0)
292   - mysql2 (0.3.11)
  312 + mysql2 (0.3.15)
293 313 net-ldap (0.3.1)
294 314 net-scp (1.0.4)
295 315 net-ssh (>= 1.99.1)
296   - net-ssh (2.7.0)
297   - nokogiri (1.5.10)
  316 + net-ssh (2.8.0)
  317 + nio4r (1.0.0)
  318 + nokogiri (1.5.11)
298 319 oauth (0.4.7)
299 320 oauth2 (0.8.1)
300 321 faraday (~> 0.8)
... ... @@ -308,7 +329,7 @@ GEM
308 329 omniauth-github (1.1.1)
309 330 omniauth (~> 1.0)
310 331 omniauth-oauth2 (~> 1.1)
311   - omniauth-google-oauth2 (0.2.1)
  332 + omniauth-google-oauth2 (0.2.2)
312 333 omniauth (~> 1.0)
313 334 omniauth-oauth2
314 335 omniauth-oauth (1.0.1)
... ... @@ -321,50 +342,50 @@ GEM
321 342 multi_json (~> 1.3)
322 343 omniauth-oauth (~> 1.0)
323 344 orm_adapter (0.5.0)
324   - pg (0.15.1)
325   - phantomjs (1.9.2.0)
  345 + pg (0.17.1)
  346 + phantomjs (1.9.7.0)
326 347 poltergeist (1.4.1)
327 348 capybara (~> 2.1.0)
328 349 cliver (~> 0.2.1)
329 350 multi_json (~> 1.0)
330 351 websocket-driver (>= 0.2.0)
331   - polyglot (0.3.3)
332   - posix-spawn (0.3.6)
333   - protected_attributes (1.0.5)
  352 + polyglot (0.3.4)
  353 + posix-spawn (0.3.8)
  354 + protected_attributes (1.0.7)
334 355 activemodel (>= 4.0.1, < 5.0)
335   - pry (0.9.12.4)
  356 + pry (0.9.12.6)
336 357 coderay (~> 1.0)
337 358 method_source (~> 0.8)
338 359 slop (~> 3.4)
339 360 pyu-ruby-sasl (0.0.3.3)
340 361 quiet_assets (1.0.2)
341 362 railties (>= 3.1, < 5.0)
342   - racc (1.4.10)
  363 + racc (1.4.11)
343 364 rack (1.5.2)
344 365 rack-accept (0.4.5)
345 366 rack (>= 0.4)
346   - rack-attack (2.3.0)
  367 + rack-attack (3.0.0)
347 368 rack
348 369 rack-cors (0.2.9)
349   - rack-mini-profiler (0.1.31)
  370 + rack-mini-profiler (0.9.1)
350 371 rack (>= 1.1.3)
351 372 rack-mount (0.8.3)
352 373 rack (>= 1.0.0)
353   - rack-protection (1.5.1)
  374 + rack-protection (1.5.2)
354 375 rack
355 376 rack-test (0.6.2)
356 377 rack (>= 1.0)
357   - rails (4.0.2)
358   - actionmailer (= 4.0.2)
359   - actionpack (= 4.0.2)
360   - activerecord (= 4.0.2)
361   - activesupport (= 4.0.2)
  378 + rails (4.0.4)
  379 + actionmailer (= 4.0.4)
  380 + actionpack (= 4.0.4)
  381 + activerecord (= 4.0.4)
  382 + activesupport (= 4.0.4)
362 383 bundler (>= 1.3.0, < 2.0)
363   - railties (= 4.0.2)
  384 + railties (= 4.0.4)
364 385 sprockets-rails (~> 2.0.0)
365 386 rails-observers (0.1.2)
366 387 activemodel (~> 4.0)
367   - rails_best_practices (1.14.4)
  388 + rails_best_practices (1.15.2)
368 389 activesupport
369 390 awesome_print
370 391 code_analyzer (>= 0.4.3)
... ... @@ -373,21 +394,21 @@ GEM
373 394 i18n
374 395 require_all
375 396 ruby-progressbar
376   - railties (4.0.2)
377   - actionpack (= 4.0.2)
378   - activesupport (= 4.0.2)
  397 + railties (4.0.4)
  398 + actionpack (= 4.0.4)
  399 + activesupport (= 4.0.4)
379 400 rake (>= 0.8.7)
380 401 thor (>= 0.18.1, < 2.0)
381   - raindrops (0.12.0)
382   - rake (10.1.0)
  402 + raindrops (0.13.0)
  403 + rake (10.2.2)
383 404 raphael-rails (2.1.2)
384   - rb-fsevent (0.9.3)
385   - rb-inotify (0.9.2)
  405 + rb-fsevent (0.9.4)
  406 + rb-inotify (0.9.3)
386 407 ffi (>= 0.5.0)
387   - rdoc (3.12.2)
  408 + rdoc (4.1.1)
388 409 json (~> 1.4)
389 410 redcarpet (2.2.2)
390   - redis (3.0.6)
  411 + redis (3.0.7)
391 412 redis-actionpack (4.0.0)
392 413 actionpack (~> 4)
393 414 redis-rack (~> 1.5.0)
... ... @@ -414,45 +435,47 @@ GEM
414 435 rspec-core (~> 2.14.0)
415 436 rspec-expectations (~> 2.14.0)
416 437 rspec-mocks (~> 2.14.0)
417   - rspec-core (2.14.7)
418   - rspec-expectations (2.14.4)
  438 + rspec-core (2.14.8)
  439 + rspec-expectations (2.14.5)
419 440 diff-lcs (>= 1.1.3, < 2.0)
420   - rspec-mocks (2.14.4)
421   - rspec-rails (2.14.0)
  441 + rspec-mocks (2.14.6)
  442 + rspec-rails (2.14.2)
422 443 actionpack (>= 3.0)
  444 + activemodel (>= 3.0)
423 445 activesupport (>= 3.0)
424 446 railties (>= 3.0)
425 447 rspec-core (~> 2.14.0)
426 448 rspec-expectations (~> 2.14.0)
427 449 rspec-mocks (~> 2.14.0)
428 450 ruby-hmac (0.4.0)
429   - ruby-progressbar (1.2.0)
  451 + ruby-progressbar (1.4.2)
430 452 rubyntlm (0.1.1)
431   - safe_yaml (0.9.7)
  453 + safe_yaml (1.0.1)
432 454 sanitize (2.0.6)
433 455 nokogiri (>= 1.4.4)
434   - sass (3.2.12)
435   - sass-rails (4.0.1)
  456 + sass (3.2.18)
  457 + sass-rails (4.0.2)
436 458 railties (>= 4.0.0, < 5.0)
437   - sass (>= 3.1.10)
  459 + sass (~> 3.2.0)
  460 + sprockets (~> 2.8, <= 2.11.0)
438 461 sprockets-rails (~> 2.0.0)
439   - sdoc (0.3.20)
440   - json (>= 1.1.3)
441   - rdoc (~> 3.10)
  462 + sdoc (0.4.0)
  463 + json (~> 1.8)
  464 + rdoc (~> 4.0, < 5.0)
442 465 seed-fu (2.3.0)
443 466 activerecord (>= 3.1, < 4.1)
444 467 activesupport (>= 3.1, < 4.1)
445   - select2-rails (3.5.2)
  468 + select2-rails (3.5.4)
446 469 thor (~> 0.14)
447 470 settingslogic (2.0.9)
448   - sexp_processor (4.4.0)
  471 + sexp_processor (4.4.3)
449 472 shoulda-matchers (2.1.0)
450 473 activesupport (>= 3.0.0)
451   - sidekiq (2.17.0)
  474 + sidekiq (3.0.0)
452 475 celluloid (>= 0.15.2)
453   - connection_pool (>= 1.0.0)
  476 + connection_pool (>= 2.0.0)
454 477 json
455   - redis (>= 3.0.4)
  478 + redis (>= 3.0.6)
456 479 redis-namespace (>= 1.3.1)
457 480 simple_oauth (0.1.9)
458 481 simplecov (0.8.2)
... ... @@ -468,7 +491,7 @@ GEM
468 491 slim (2.0.2)
469 492 temple (~> 0.6.6)
470 493 tilt (>= 1.3.3, < 2.1)
471   - slop (3.4.7)
  494 + slop (3.5.0)
472 495 spinach (0.8.7)
473 496 colorize (= 0.5.8)
474 497 gherkin-ruby (>= 0.3.1)
... ... @@ -477,7 +500,7 @@ GEM
477 500 railties (>= 3)
478 501 spinach (>= 0.4)
479 502 spork (1.0.0rc4)
480   - sprockets (2.10.1)
  503 + sprockets (2.11.0)
481 504 hike (~> 1.2)
482 505 multi_json (~> 1.0)
483 506 rack (~> 1.0)
... ... @@ -490,42 +513,42 @@ GEM
490 513 state_machine (1.2.0)
491 514 stringex (1.5.1)
492 515 temple (0.6.7)
493   - term-ansicolor (1.2.2)
494   - tins (~> 0.8)
495   - test_after_commit (0.2.2)
496   - therubyracer (0.12.0)
  516 + term-ansicolor (1.3.0)
  517 + tins (~> 1.0)
  518 + test_after_commit (0.2.3)
  519 + therubyracer (0.12.1)
497 520 libv8 (~> 3.16.14.0)
498 521 ref
499   - thin (1.6.1)
  522 + thin (1.6.2)
500 523 daemons (>= 1.0.9)
501 524 eventmachine (>= 1.0.0)
502 525 rack (>= 1.0.0)
503   - thor (0.18.1)
504   - thread_safe (0.1.3)
505   - atomic
  526 + thor (0.19.1)
  527 + thread_safe (0.3.1)
  528 + atomic (>= 1.1.7, < 2)
506 529 tilt (1.4.1)
507 530 timers (1.1.0)
508   - tinder (1.9.3)
  531 + tinder (1.9.4)
509 532 eventmachine (~> 1.0)
510   - faraday (~> 0.8)
  533 + faraday (~> 0.8.9)
511 534 faraday_middleware (~> 0.9)
512 535 hashie (>= 1.0, < 3)
513 536 json (~> 1.8.0)
514 537 mime-types (~> 1.19)
515 538 multi_json (~> 1.7)
516 539 twitter-stream (~> 0.1)
517   - tins (0.13.1)
  540 + tins (1.0.1)
518 541 treetop (1.4.15)
519 542 polyglot
520 543 polyglot (>= 0.3.1)
521   - turbolinks (2.0.0)
  544 + turbolinks (2.2.1)
522 545 coffee-rails
523 546 twitter-stream (0.1.16)
524 547 eventmachine (>= 0.12.8)
525 548 http_parser.rb (~> 0.5.1)
526 549 simple_oauth (~> 0.1.4)
527   - tzinfo (0.3.38)
528   - uglifier (2.3.2)
  550 + tzinfo (0.3.39)
  551 + uglifier (2.5.0)
529 552 execjs (>= 0.3.0)
530 553 json (>= 1.8.0)
531 554 underscore-rails (1.4.4)
... ... @@ -535,17 +558,17 @@ GEM
535 558 raindrops (~> 0.7)
536 559 unicorn-worker-killer (0.4.2)
537 560 unicorn (~> 4)
538   - virtus (1.0.1)
539   - axiom-types (~> 0.0.5)
  561 + virtus (1.0.2)
  562 + axiom-types (~> 0.1)
540 563 coercible (~> 1.0)
541   - descendants_tracker (~> 0.0.1)
542   - equalizer (~> 0.0.7)
  564 + descendants_tracker (~> 0.0.3)
  565 + equalizer (~> 0.0.9)
543 566 warden (1.2.3)
544 567 rack (>= 1.0)
545   - webmock (1.16.0)
  568 + webmock (1.17.4)
546 569 addressable (>= 2.2.7)
547 570 crack (>= 0.3.2)
548   - websocket-driver (0.3.1)
  571 + websocket-driver (0.3.2)
549 572 xpath (2.0.0)
550 573 nokogiri (~> 1.3)
551 574 yajl-ruby (1.1.0)
... ... @@ -612,6 +635,7 @@ DEPENDENCIES
612 635 modernizr (= 2.6.2)
613 636 mysql2
614 637 omniauth (~> 1.1.3)
  638 + omniauth-env!
615 639 omniauth-github
616 640 omniauth-google-oauth2
617 641 omniauth-twitter
... ...
app/controllers/omniauth_callbacks_controller.rb
  Diff comments   View file @7ee6026
... ... @@ -23,6 +23,10 @@ class OmniauthCallbacksController &lt; Devise::OmniauthCallbacksController
23 23 sign_in_and_redirect(@user)
24 24 end
25 25  
  26 + def env
  27 + handle_omniauth
  28 + end
  29 +
26 30 private
27 31  
28 32 def handle_omniauth
... ...
app/helpers/oauth_helper.rb
  Diff comments   View file @7ee6026
... ... @@ -11,6 +11,10 @@ module OauthHelper
11 11 Devise.omniauth_providers
12 12 end
13 13  
  14 + def env_enabled?
  15 + Devise.omniauth_providers.include?(:env)
  16 + end
  17 +
14 18 def enabled_social_providers
15 19 enabled_oauth_providers.select do |name|
16 20 [:twitter, :github, :google_oauth2].include?(name.to_sym)
... ...
app/views/devise/sessions/_new_env.html.haml 0 → 100644
  Diff comments   View file @7ee6026
... ... @@ -0,0 +1,2 @@
  1 +%script
  2 + window.location.href = '/gitlab/users/auth/env'
... ...
app/views/devise/sessions/new.html.haml
  Diff comments   View file @7ee6026
  1 += render 'devise/sessions/new_env' if env_enabled?
  2 +
1 3 .login-box
2 4 %h3.page-title Sign in
3 5 - if ldap_enabled?
... ...
config/gitlab.yml.example
  Diff comments   View file @7ee6026
... ... @@ -129,17 +129,24 @@ production: &amp;base
129 129 password: '_the_password_of_the_bind_user'
130 130 allow_username_or_email_login: true
131 131  
  132 + env:
  133 + enabled: true
  134 + database_name: 'colab'
  135 + host: 'localhost'
  136 + user: 'colab'
  137 + password: 'colab'
  138 +
132 139 ## OmniAuth settings
133 140 omniauth:
134 141 # Allow login via Twitter, Google, etc. using OmniAuth providers
135   - enabled: false
  142 + enabled: true
136 143  
137 144 # CAUTION!
138 145 # This allows users to login without having a user account first (default: false).
139 146 # User accounts will be created automatically when authentication was successful.
140   - allow_single_sign_on: false
  147 + allow_single_sign_on: true
141 148 # Locks down those users until they have been cleared by the admin (default: true).
142   - block_auto_created_users: true
  149 + block_auto_created_users: false
143 150  
144 151 ## Auth providers
145 152 # Uncomment the following lines and fill in the data of the auth provider you want to use
... ...
config/initializers/1_settings.rb
  Diff comments   View file @7ee6026
... ... @@ -67,6 +67,9 @@ Settings[&#39;omniauth&#39;] ||= Settingslogic.new({})
67 67 Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
68 68 Settings.omniauth['providers'] ||= []
69 69  
  70 +Settings['env'] ||= Settingslogic.new({})
  71 +Settings.env['enabled'] = false if Settings.env['enabled'].nil?
  72 +
70 73 Settings['issues_tracker'] ||= {}
71 74  
72 75 #
... ...
config/initializers/devise.rb
  Diff comments   View file @7ee6026
... ... @@ -208,22 +208,25 @@ Devise.setup do |config|
208 208 # manager.default_strategies(scope: :user).unshift :some_external_strategy
209 209 # end
210 210  
  211 + ldap_configs = {
  212 + host: Gitlab.config.ldap['host'],
  213 + base: Gitlab.config.ldap['base'],
  214 + uid: Gitlab.config.ldap['uid'],
  215 + port: Gitlab.config.ldap['port'],
  216 + method: Gitlab.config.ldap['method'],
  217 + bind_dn: Gitlab.config.ldap['bind_dn'],
  218 + password: Gitlab.config.ldap['password']
  219 + }
  220 +
211 221 if Gitlab.config.ldap.enabled
212 222 if Gitlab.config.ldap.allow_username_or_email_login
213 223 email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
214 224 else
215 225 email_stripping_proc = ->(name) {name}
216 226 end
217   -
218   - config.omniauth :ldap,
219   - host: Gitlab.config.ldap['host'],
220   - base: Gitlab.config.ldap['base'],
221   - uid: Gitlab.config.ldap['uid'],
222   - port: Gitlab.config.ldap['port'],
223   - method: Gitlab.config.ldap['method'],
224   - bind_dn: Gitlab.config.ldap['bind_dn'],
225   - password: Gitlab.config.ldap['password'],
226   - name_proc: email_stripping_proc
  227 +
  228 + ldap_configs[:name_proc] = email_stripping_proc
  229 + config.omniauth :ldap, ldap_configs
227 230 end
228 231  
229 232 Gitlab.config.omniauth.providers.each do |provider|
... ... @@ -238,4 +241,5 @@ Devise.setup do |config|
238 241 config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
239 242 end
240 243 end
  244 + config.omniauth :env, ldap_configs if Gitlab.config.env.enabled
241 245 end
... ...
lib/gitlab/backend/grack_auth.rb
  Diff comments   View file @7ee6026
... ... @@ -57,6 +57,13 @@ module Grack
57 57 return unauthorized
58 58 end
59 59  
  60 + elsif Gitlab.config.env.enabled
  61 + return unauthorized unless @env['HTTP_REMOTE_USER']
  62 + @user = User.find_by_provider_and_extern_uid('env', @env['HTTP_REMOTE_USER'])
  63 + return unauthorized unless @user
  64 + Gitlab::ShellEnv.set_env(@user)
  65 + @env['REMOTE_USER'] = @env['HTTP_REMOTE_USER']
  66 +
60 67 else
61 68 return unauthorized unless project.public?
62 69 end
... ...