Merge branch 'master' into staging_rails4

Victor Costa
2 parents 7041451b b256dff9
Showing 8 changed files with 54 additions and 22 deletions Show diff stats
etc/noosfero/varnish-accept-language.vcl
etc/noosfero/varnish-noosfero.vcl
plugins/ldap/Gemfile
plugins/ldap/dependencies.rb
plugins/ldap/lib/ldap_authentication.rb
plugins/ldap/lib/ldap_plugin.rb
plugins/ldap/test/unit/ldap_plugin_test.rb
plugins/stoa/script/stoa-auth-server
@@ -23,7 +23,7 @@ C{
 #include <string.h>
 #define DEFAULT_LANGUAGE "en"
-#define SUPPORTED_LANGUAGES ":de:eo:es:fr:hy:it:pt:ru:"
+#define SUPPORTED_LANGUAGES ":en:cs:de:eo:es:fr:hy:it:pt:ru:"
 #define vcl_string char
 #define LANG_LIST_SIZE 16
@@ -162,20 +162,21 @@ void select_language(const vcl_string *incoming_header, char *lang) {
 }
 /* Reads req.http.Accept-Language and writes X-Varnish-Accept-Language */
-void vcl_rewrite_accept_language(const struct sess *sp) {
+void vcl_rewrite_accept_language(const struct vrt_ctx *ctx) {
     vcl_string *in_hdr;
     vcl_string lang[LANG_MAXLEN];
+    const struct gethdr_s hdr = { HDR_REQ, "\020Accept-Language:" };
+    const struct gethdr_s hdrUpd = { HDR_REQ, "\032X-Varnish-Accept-Language:"};
     /* Get Accept-Language header from client */
-    in_hdr = VRT_GetHdr(sp, HDR_REQ, "\020Accept-Language:");
+    in_hdr = VRT_GetHdr(ctx, &hdr);
     /* Normalize and filter out by list of supported languages */
     memset(lang, 0, sizeof(lang));
     select_language(in_hdr, lang);
     /* By default, use a different header name: don't mess with backend logic */
-    VRT_SetHdr(sp, HDR_REQ, "\032X-Varnish-Accept-Language:", lang, vrt_magic_string_end);
-
+    VRT_SetHdr(ctx, &hdrUpd, lang, vrt_magic_string_end);
     return;
 }
@@ -188,15 +189,14 @@ void vcl_rewrite_accept_language(const struct sess *sp) {
 sub vcl_recv {
   C{
-    vcl_rewrite_accept_language(sp);
+    vcl_rewrite_accept_language(ctx);
   }C
 }
-sub vcl_fetch {
+sub vcl_backend_response {
   if (beresp.http.Vary) {
     set beresp.http.Vary = beresp.http.Vary + ", X-Varnish-Accept-Language";
   } else {
     set beresp.http.Vary = "X-Varnish-Accept-Language";
   }
 }
-
+vcl 4.0;
+
 sub vcl_recv {
-  if (req.request == "GET" || req.request == "HEAD") {
+  if (req.method == "GET" || req.method == "HEAD") {
     if (req.http.Cookie) {
       # We only care about the "_noosfero_.*" cookies, used by Noosfero
       if (req.http.Cookie !~ "_noosfero_.*" ) {
@@ -17,10 +19,10 @@ sub vcl_deliver {
   }
 }
-sub vcl_error {
-    set obj.http.Content-Type = "text/html; charset=utf-8";
+sub vcl_backend_error {
+    set beresp.http.Content-Type = "text/html; charset=utf-8";
-    synthetic {"
+    synthetic({"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -52,7 +54,7 @@ sub vcl_error {
   <div id='wrap'>
     <div id='header'>
       <div id='logo'>&nbsp;</div>
-      <div id='details'><b>"} + obj.status + "</b> - " + obj.response + {"</div>
+      <div id='details'><b>"} + beresp.status + "</b> - " + beresp.reason + {"</div>
     </div>
     <div id='de' style='display: none' class='message'>
@@ -145,6 +147,6 @@ sub vcl_error {
   </div>
 </body>
 </html>
-     "};
+     "});
     return(deliver);
 }
-gem "net-ldap"
+gem "net-ldap", "~> 0.12.1"
 gem "magic", ">= 0.2.8"
@@ -1 +0,0 @@
-require 'net/ldap'
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-require 'iconv'
 require 'net/ldap'
 require 'net/ldap/dn'
 require 'magic'
@@ -111,7 +110,14 @@ class LdapAuthentication
     else
       ldap_con = initialize_ldap_con(self.account, self.account_password)
     end
-    login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
+    login_filter = nil
+    (self.attr_login || []).split.each do |attr|
+      if(login_filter.nil?)
+        login_filter = Net::LDAP::Filter.eq( attr, login )
+      else
+        login_filter = login_filter | Net::LDAP::Filter.eq( attr, login )
+      end
+    end
     object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
     attrs = {}
@@ -55,7 +55,7 @@ class LdapPlugin &lt; Noosfero::Plugin
       end
       if attrs
-        user.login = login
+        user.login = get_login(attrs, ldap.attr_login, login)
         user.email = get_email(attrs, login)
         user.name =  attrs[:fullname]
         user.password = password
@@ -94,6 +94,11 @@ class LdapPlugin &lt; Noosfero::Plugin
     user
   end
+  def get_login(attrs, attr_login, login)
+    user_login = Array.wrap(attrs[attr_login.split.first.to_sym])
+    user_login.empty? ? login : user_login.first
+  end
+
   def get_email(attrs, login)
     return attrs[:mail] unless attrs[:mail].blank?
@@ -14,4 +14,24 @@ class LdapPluginTest &lt; ActiveSupport::TestCase
     refute plugin.allow_password_recovery
   end
+  should 'return login when exists a login attribute returned by ldap' do
+    plugin = LdapPlugin.new
+    assert_equal 'test', plugin.get_login({:uid => 'test'}, 'uid', 'test2')
+  end
+
+  should 'return the attribute configured by attr_login when the attribute exists' do
+    plugin = LdapPlugin.new
+    assert_equal 'test', plugin.get_login({:uid => 'test'}, 'uid', 'test2')
+  end
+
+  should 'return login when the ldap attribute does not exists' do
+    plugin = LdapPlugin.new
+    assert_equal 'test2', plugin.get_login({:uid => 'test'}, 'mail', 'test2')
+  end
+
+  should 'use the first word at attr_login as the login key' do
+    plugin = LdapPlugin.new
+    assert_equal 'test', plugin.get_login({:uid => 'test', :mail => 'test@test'}, 'uid mail', 'test2')
+  end
+
 end
@@ -25,7 +25,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Stoa authentication deamon"
-NAME=stoa-auth-daemon
+NAME=stoa-auth-server
 SCRIPTNAME=/etc/init.d/$NAME
 # default values
@@ -33,8 +33,8 @@ NOOSFERO_DIR=/var/lib/noosfero/current
 NOOSFERO_USER=noosfero
 # Read configuration variable file if it is present
-if [ -r /etc/default/$NAME ]; then
-  . /etc/default/$NAME
+if [ -r /etc/default/noosfero ]; then
+  . /etc/default/noosfero
 else
   # for running from development setup, or from git with the script symlinked
   script=$(readlink -f $0)
1	-gem "net-ldap"	1	+gem "net-ldap", "~> 0.12.1"
2	gem "magic", ">= 0.2.8"	2	gem "magic", ">= 0.2.8"
	@@ -14,4 +14,24 @@ class LdapPluginTest < ActiveSupport::TestCase		@@ -14,4 +14,24 @@ class LdapPluginTest < ActiveSupport::TestCase
14	refute plugin.allow_password_recovery	14	refute plugin.allow_password_recovery
15	end	15	end
16		16
		17	+ should 'return login when exists a login attribute returned by ldap' do
		18	+ plugin = LdapPlugin.new
		19	+ assert_equal 'test', plugin.get_login({:uid => 'test'}, 'uid', 'test2')
		20	+ end
		21	+
		22	+ should 'return the attribute configured by attr_login when the attribute exists' do
		23	+ plugin = LdapPlugin.new
		24	+ assert_equal 'test', plugin.get_login({:uid => 'test'}, 'uid', 'test2')
		25	+ end
		26	+
		27	+ should 'return login when the ldap attribute does not exists' do
		28	+ plugin = LdapPlugin.new
		29	+ assert_equal 'test2', plugin.get_login({:uid => 'test'}, 'mail', 'test2')
		30	+ end
		31	+
		32	+ should 'use the first word at attr_login as the login key' do
		33	+ plugin = LdapPlugin.new
		34	+ assert_equal 'test', plugin.get_login({:uid => 'test', :mail => 'test@test'}, 'uid mail', 'test2')
		35	+ end
		36	+
17	end	37	end