Project

General

Profile

prewikka-auth-user.2.diff

New patch fixing settings loading issue. - Yoann VANDOORSELAERE, 10/30/2006 11:02 AM

Download (2.16 KB)

View differences:

prewikka/modules/auth/cgi/cgi.py (local)
27 27
	# Need to call Auth.Auth's init because the init of 
28 28
	# our superclass Auth.AnonymousAuth does not set env.
29 29
        Auth.Auth.__init__(self, env)
30
	self.config = config
31 30

  
32 31
    def getUser(self, request):
33
	user = os.environ.get("REMOTE_USER", None)        
32
	user = request.getRemoteUser()        
34 33
    	if not user:
35 34
	    raise Auth.AuthError(message="CGI Authentication failed: no user specified.")
36 35
        
37
        return User.User(self.db, user, User.ALL_PERMISSIONS, self.config)
36
        return User.User(self.db, user, User.ALL_PERMISSIONS, self.db.getConfiguration(user))
38 37

  
39 38

  
40 39

  
prewikka/Request.py (local)
81 81
    def getQueryString(self):
82 82
        pass
83 83

  
84
    def getRemoteUser(self):
85
        pass
86
    
84 87
    def getClientAddr(self):
85 88
        pass
86 89

  
prewikka/ModPythonHandler.py (local)
44 44
    def addCookie(self, param, value, expires):
45 45
    	c = Cookie.Cookie(param, value)
46 46
	Cookie.add_cookie(self._req, c, expires)
47
        
47

  
48
    def getRemoteUser(self):
49
        self._req.get_basic_auth_pw()
50

  
51
        user = self._req.user
52
        if user:
53
            user.strip()
54

  
55
        return user
56
    
48 57
    def getQueryString(self):
49 58
    	return self._req.unparsed_uri
50 59

  
cgi-bin/prewikka.cgi (local)
73 73
    def getReferer(self):
74 74
        return os.environ.get("HTTP_REFERER", "").strip()
75 75

  
76
    def getRemoteUser(self):
77
        user = os.environ.get("REMOTE_USER", None)
78
        if user:
79
            user.strip()
80
            
81
        return user
76 82

  
83

  
77 84
request = CGIRequest()
78 85
request.init()
79 86