From 680a42e57e9287478f0ac5ce7c63dbb1b076f65c Mon Sep 17 00:00:00 2001 From: Ricky Zhou Date: Thu, 9 Aug 2007 17:08:39 -0400 Subject: [PATCH] * Fix blank password authentication bug. * More additions group editing. --- fas/devdata.sqlite | Bin 22528 -> 0 bytes fas/devdata.sqlite.bak | Bin 16384 -> 0 bytes fas/fas/controllers.py | 29 ++++++++++++++--------------- fas/fas/fasLDAP.py | 2 ++ fas/fasdb.sqlite | Bin 22528 -> 0 bytes 5 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 fas/devdata.sqlite delete mode 100644 fas/devdata.sqlite.bak delete mode 100644 fas/fasdb.sqlite diff --git a/fas/devdata.sqlite b/fas/devdata.sqlite deleted file mode 100644 index 30840e95ae2e72ea5a140967eaf61eac4ee65c7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22528 zcmeI3y>Ht_6u|FDeb{uI#7-LyhSBR#SOjdC-y+o%t?CM`P+4{)IZcK@IEs`@)V36f zPUESN(f=b`mu4=Ip>wyQK!=VU`yX^E3KS$oNmMLbK@b=P-)}I^5R!W#epu8|u{2%)9) zvLDpU3&j4&K43BP;u=Q;0GCovrO{(WQ5_|(YpP@_mTVfPX{dSCavV!FRY#{(lv`A? z^O7NpVtz}Mw`85jVnGuNT7I%fDo9d6(dulVG;djkq8O5`=Orr1mME%JliMwuT2zt>Z)uznr2Bay_R>PrXj?+zfk^f(ttk*et)kj?X^`tnm)R z>gbw^*%XytlUduT48OBJ%dBW{O)0udpWjVq`L#9tJsTN!+IM>1VQ|Szo95TeVOi^I z_sDLZ&|_ybW3r|R;avDS;&qZfV>X>*>K-+zZTFmhKc?#9*|*((_lTawwU2x5(tiKj zPR|}`QpMqzURgGr;KzRkKS%gE{uTer{KjI|d)+ty-Wpq(3}0NkWT6Mk%wOmJO?E3g zkGMP(Ul{B!gdyLLqT;aEIqiCf;dOC3E`r)O4U9lZeC^JRj4M|91?zcx@rs=x?B4fS zaK}C2vi!yd9=sp9An<5VH*{0@usrRIu^h>9q1JGB9|i3u7syPNa>8J7Da$Jg9+**| zVe_ujJ9hhhw{sGWZldVsbpO+BW{+a5_tmk$@BaXhTp<1dAh|&N13+?tzyAY3a)I+7 z0Fn!w{{WC&mYEdFqL+wSVE$lN*`Kk5e?c$*2mW}vn&m$h@L(lKWxG)_+qIn&&-Kp2 z^o(nVDekEB?l6f`u6|Z}NM<%7d(~k!K59sE!&HtixN|$p3j!X{AbAtlAAfo$ma>W0 zksP-emdr}{ZxU`X${#gK4;%jT#5V&ZH)<|$!iOsveovT{CyaMJO!$v%d)NOD&_U%! zkOw>eD#}TXvqs+G#KWzaQL(Bw%?yrvoHsq_^jkf*>$#niQL@|5gL8tpoZ)vjX89vF z>L3?5?)vs1cQeaxZ{xvtktgEri@qrs`EO;~BXRjTyfT`}krgw){D@XWx!T}_;;jsS iuziV@@sW(bhZv2072f{=Ai2Q%KL8{bh<^Y`F8=|qmpcgn diff --git a/fas/devdata.sqlite.bak b/fas/devdata.sqlite.bak deleted file mode 100644 index 092c6e0359e9dcc445e15c01f5bea470475b0981..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI0&u`;I6vt=mG;X|GSaDb%s*2&%Mru`$J$CF!NQ5eainMf-bkQQMqH#P4)}~1| zc3~?ap;Yj1aOA??_r#xoIB?*PfdjIgG(Sk&NPAc$zt5qzpP%2G`KmMDQ5sKbK_p0L zFuLFoF;Na-j6NX*A@m3>q9BBFb0Iu;eI|!wB&h?X*$%mOO#W?({;uzqto`e$8Dp-I@F?;-|^-vtS%b& zX-G*?%c6|3HW$Kl8Fg)D_`_j%|8AXVmd^&uTku-Lh?i`!;v@y+!r7j~cIkxrXGL{EK`g|G8Ru008b| zUw)3)-JEi9^17Rj94D{4nMiT+x|;-!{eR(94*)=Bi2WbdKLBJCSpNW!UEur=0NDln z9{{oo_&)$-mw5dv=nX<|@Ynb!>1XM8=^y!z|Gge#f)!2E@b!lg_j=;nAPl19k91V8 zR+?4PtbAIlk|ad-R6+;|d~$r+tbSIlle7BqNu~abd{KS2pS(-*S}(*Ed0MF-eO{^W zF}+Amzig7z^IDCZpB_IsucoQ(k>HW=N%Q!m+Gtiz&eE`WH4H{qv#44uN_p*L4Wpp% zi&x>xUJ!{Ezl;XSb1UsglZ$-)SXQ*{ZTzF0%qHr#E<-VzTyhIDngrLFQ~R5s=ePR& zLflNsu&iP_+_?VYJ8IuDVR6BOUW@zwNQB`+snr7cK{)L3tHtWG&O;uC-wj6oO(mvJ z#`GU$)#5=euT{2h({Q3ii%xDf4mQ?FHzw)%@mXHcc6RV}IF-FS8e9&eZhBRgg-_nT zt@25cMR9JG{vIh;2zIFCwWFOo1WVh;iY0fO;Qs)SUE=kh#|4B7_E}Z+x(LEB81$#x^jzq{a{uLTZXd<0?uxP0)MWnGUrom{%Z|Ep4_nLqXL)aHjk8MY z`lATjqhJ^XgZ|BNB0g!TMfX8oJK4R%2j_alW;lC%Z@l+V(GCys_=l+y=~*rCML!Cn ztEjsacz;=u#r!o?Nk3TY_&N8Vq!ue%dF}l0j#(~_B$?@A=n?oo0Av^V{T~3b3-~_( MWEb#%0LU)?0uPCR$p8QV diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py index cc5c22e..9db02c4 100644 --- a/fas/fas/controllers.py +++ b/fas/fas/controllers.py @@ -72,7 +72,7 @@ class editGroup(widgets.WidgetsList): fedoraGroupUserCanRemove = widgets.CheckBox(label='Self Removal') fedoraGroupJoinMsg = widgets.TextField(label='Group Join Message') -editGroupForm = widgets.ListForm(fields=editPerson(), submit_text='Update') +editGroupForm = widgets.ListForm(fields=editGroup(), submit_text='Update') class findUser(widgets.WidgetsList): userName = widgets.AutoCompleteField(label='Username', search_controller='search', search_param='userName', result_name='people') @@ -228,7 +228,6 @@ class Root(controllers.RootController): @expose(template="fas.templates.editGroup") @identity.require(identity.not_anonymous()) def editGroup(self, groupName, action=None): - pass userName = turbogears.identity.current.user_name try: Groups.byUserName(userName)['accounts'].cn @@ -241,14 +240,14 @@ class Root(controllers.RootController): turbogears.flash('You cannot edit %s' % groupName) turbogears.redirect('viewGroup?groupName=%s' % groupName) group = Groups.groups(groupName)[groupName] - #value = {'givenName' : user.givenName, - # 'mail' : user.mail, - # 'fedoraPersonBugzillaMail' : user.fedoraPersonBugzillaMail, - # 'fedoraPersonIrcNick' : user.fedoraPersonIrcNick, - # 'fedoraPersonKeyId' : user.fedoraPersonKeyId, - # 'telephoneNumber' : user.telephoneNumber, - # 'postalAddress' : user.postalAddress, - # 'description' : user.description, } + value = {'groupName' : groupName, + 'fedoraGroupOwner' : group.fedoraGroupOwner, + 'fedoraGroupType' : group.fedoraGroupType, + 'fedoraGroupNeedsSponsor' : (group.fedoraGroupNeedsSponsor.upper() == 'TRUE'), + 'fedoraGroupUserCanRemove' : (group.fedoraGroupUserCanRemove.upper() == 'TRUE'), + 'fedoraGroupJoinMsg' : group.fedoraGroupJoinMsg, + 'fedoraGroupDesc' : group.fedoraGroupDesc, } + #'fedoraGroupRequires' : group.fedoraGroupRequires, } return dict(form=editGroupForm, value=value) @expose(template="fas.templates.groupList") @@ -357,15 +356,15 @@ class Root(controllers.RootController): sponsor = turbogears.identity.current.user_name try: group = Groups.groups(groupName)[groupName] - except KeyError, e: - turbogears.flash('Group Error: %s does not exist - %s' % (groupName, e)) + except KeyError: + turbogears.flash('Group Error: %s does not exist.' % groupName) turbogears.redirect('viewGroup?groupName=%s' % group.cn) try: p = Person.byUserName(userName) if not p.cn: - raise KeyError, 'User %s, just not there' % userName - except KeyError, e: - turbogears.flash('User Error: %s does not exist - %s' % (userName, e)) + raise KeyError, userName + except KeyError: + turbogears.flash('User Error: User %s does not exist.' % userName) turbogears.redirect('viewGroup?groupName=%s' % group.cn) g = Groups.byGroupName(groupName, includeUnapproved=True) diff --git a/fas/fas/fasLDAP.py b/fas/fas/fasLDAP.py index 5aa0e56..75851e0 100644 --- a/fas/fas/fasLDAP.py +++ b/fas/fas/fasLDAP.py @@ -355,6 +355,8 @@ class Person: @classmethod def auth(self, who, password, ldapServer=None): ''' Basic Authentication Module ''' + if not password: + raise AuthError if not ldapServer: s = Server() ldapServer = s.ldapConn diff --git a/fas/fasdb.sqlite b/fas/fasdb.sqlite deleted file mode 100644 index 30840e95ae2e72ea5a140967eaf61eac4ee65c7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22528 zcmeI3y>Ht_6u|FDeb{uI#7-LyhSBR#SOjdC-y+o%t?CM`P+4{)IZcK@IEs`@)V36f zPUESN(f=b`mu4=Ip>wyQK!=VU`yX^E3KS$oNmMLbK@b=P-)}I^5R!W#epu8|u{2%)9) zvLDpU3&j4&K43BP;u=Q;0GCovrO{(WQ5_|(YpP@_mTVfPX{dSCavV!FRY#{(lv`A? z^O7NpVtz}Mw`85jVnGuNT7I%fDo9d6(dulVG;djkq8O5`=Orr1mME%JliMwuT2zt>Z)uznr2Bay_R>PrXj?+zfk^f(ttk*et)kj?X^`tnm)R z>gbw^*%XytlUduT48OBJ%dBW{O)0udpWjVq`L#9tJsTN!+IM>1VQ|Szo95TeVOi^I z_sDLZ&|_ybW3r|R;avDS;&qZfV>X>*>K-+zZTFmhKc?#9*|*((_lTawwU2x5(tiKj zPR|}`QpMqzURgGr;KzRkKS%gE{uTer{KjI|d)+ty-Wpq(3}0NkWT6Mk%wOmJO?E3g zkGMP(Ul{B!gdyLLqT;aEIqiCf;dOC3E`r)O4U9lZeC^JRj4M|91?zcx@rs=x?B4fS zaK}C2vi!yd9=sp9An<5VH*{0@usrRIu^h>9q1JGB9|i3u7syPNa>8J7Da$Jg9+**| zVe_ujJ9hhhw{sGWZldVsbpO+BW{+a5_tmk$@BaXhTp<1dAh|&N13+?tzyAY3a)I+7 z0Fn!w{{WC&mYEdFqL+wSVE$lN*`Kk5e?c$*2mW}vn&m$h@L(lKWxG)_+qIn&&-Kp2 z^o(nVDekEB?l6f`u6|Z}NM<%7d(~k!K59sE!&HtixN|$p3j!X{AbAtlAAfo$ma>W0 zksP-emdr}{ZxU`X${#gK4;%jT#5V&ZH)<|$!iOsveovT{CyaMJO!$v%d)NOD&_U%! zkOw>eD#}TXvqs+G#KWzaQL(Bw%?yrvoHsq_^jkf*>$#niQL@|5gL8tpoZ)vjX89vF z>L3?5?)vs1cQeaxZ{xvtktgEri@qrs`EO;~BXRjTyfT`}krgw){D@XWx!T}_;;jsS iuziV@@sW(bhZv2072f{=Ai2Q%KL8{bh<^Y`F8=|qmpcgn