java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 3 ++- java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 8 ++++++-- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-)
New commits: commit 5bd15b8d321d92ae9ff632f904ee03befcb675cc Author: Tomas Lestach tlestach@redhat.com Date: Mon Jan 28 18:02:55 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.54-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a0c486f..eb61de2 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.9.53 +Version: 1.9.54 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -659,6 +659,11 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Mon Jan 28 2013 Tomas Lestach tlestach@redhat.com 1.9.54-1 +- 905055 - prevent executing both LoginAction and LoginSetupAction when re- + logging after successful logout +- 889263 - whitelist more actions for the restricted period + * Thu Jan 24 2013 Tomas Lestach tlestach@redhat.com 1.9.53-1 - do not allow changing type of an existing crypto key on CryptoKeyEdit.do page - simplify CryptoKey isSSL() and isGPG() methods diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index fa95c23..69e0190 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.53-1 java/ +1.9.54-1 java/
commit 6600ee362e3316072604265ca95710de1c7f4238 Author: Tomas Lestach tlestach@redhat.com Date: Mon Jan 28 18:01:11 2013 +0100
905055 - prevent executing both LoginAction and LoginSetupAction when re-logging after successful logout
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java index c0f4154..8ebb201 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java @@ -102,7 +102,8 @@ public class LoginAction extends RhnAction { RequestContext ctx = new RequestContext(request);
if (e.isEmpty()) { - if (urlBounce == null || urlBounce.trim().equals("")) { + if (urlBounce == null || urlBounce.trim().equals("") || + urlBounce.equals("/rhn/")) { if (log.isDebugEnabled()) { log.debug("2 - url bounce is empty using [" + DEFAULT_URL_BOUNCE + "]"); }
commit 78c28cefab2a75cdb404adb5715c1d7b87e3ad88 Author: Tomas Lestach tlestach@redhat.com Date: Mon Jan 28 16:51:57 2013 +0100
889263 - whitelist more actions for the restricted period
Admin -> Subscriptions -> Software Channel Entitlements (paginate issue) Admin -> Subscriptions -> Software Channel Entitlements -> <one_of_the_entitlements> -> Organizations (update) Admin -> Subscriptions -> System Entitlements -> <one_of_the_entitlements> -> Organizations (update) Systems -> System Set Manager -> Channels -> Child Channels (change)
diff --git a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java index d931cc2..001d3e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java +++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java @@ -77,9 +77,12 @@ public class PxtAuthenticationService extends BaseAuthenticationService { // base and add on entitlements set.add("/rhn/systems/details/Edit.do"); set.add("/rhn/systems/SystemEntitlementsSubmit.do"); - // org system entitlements + // system entitlements + set.add("/rhn/admin/multiorg/EntitlementOrgs.do"); set.add("/rhn/admin/multiorg/OrgSystemSubscriptions.do"); - // org software channel entitlements + // software channel entitlements + set.add("/rhn/admin/multiorg/SoftwareEntitlements.do"); + set.add("/rhn/admin/multiorg/SoftwareEntitlementSubscriptions.do"); set.add("/rhn/admin/multiorg/OrgSoftwareSubscriptions.do"); // satellite software channel entitlements set.add("/rhn/channels/software/EntitlementsSubmit.do"); @@ -98,6 +101,7 @@ public class PxtAuthenticationService extends BaseAuthenticationService { set.add("/rhn/systems/details/SystemChannels.do"); set.add("/rhn/channel/ssm/BaseChannelSubscribe.do"); set.add("/rhn/channel/ssm/ChildSubscriptions.do"); + set.add("/rhn/channel/ssm/ChildSubscriptionsConfirm.do"); // change flex -> regular entitlemnts set.add("/rhn/systems/entitlements/"); // upload certificate
spacewalk-commits@lists.fedorahosted.org