spacewalk-commits January 2013

spacewalk-commits@lists.fedorahosted.org

7 participants
236 discussions

Changes to 'refs/tags/spacewalk-search-1.9.2-1'
by Michael Mraka 23 Jan '13

23 Jan '13

Tag 'spacewalk-search-1.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-23 15:25 +0000 Tagging package [spacewalk-search] version [1.9.2-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-java-1.9.52-1: Michael Mraka (2): use path compatible with slf4j >= 1.6 Automatic commit of package [spacewalk-search] release [1.9.2-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages search-server/spacewalk-search
by Michael Mraka 23 Jan '13

23 Jan '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit ce89d49654af4e9f679ae78315b0ee044b9c4a96 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Jan 23 16:25:55 2013 +0100 Automatic commit of package [spacewalk-search] release [1.9.2-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 4a19829..f919d28 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -1.9.1-1 search-server/spacewalk-search/ +1.9.2-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index cd40c09..aa78290 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -154,6 +154,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Wed Jan 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.2-1 +- use path compatible with slf4j >= 1.6 + * Fri Nov 23 2012 Jan Pazdziora 1.9.1-1 - Store search indexes in /var. commit 9bd3c64b3e8fe0fe62ea1c570dd27eb11b459269 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Jan 23 10:40:53 2013 +0100 use path compatible with slf4j >= 1.6 fixing FATAL | jvm 1 | 2013/01/23 09:25:08 | org/slf4j/LoggerFactory java.lang.NoClassDefFoundError: org/slf4j/LoggerFactory diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 75b56b3..f2e193d 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -38,8 +38,8 @@ wrapper.java.classpath.18=/usr/share/nutch/conf wrapper.java.classpath.19=/usr/share/rhn/search/lib/nutch-2008-12-01_04-01-21.jar wrapper.java.classpath.20=/usr/share/rhn/search/lib/commons-httpclient-3.0.jar -wrapper.java.classpath.21=/usr/share/java/slf4j-api.jar -wrapper.java.classpath.22=/usr/share/java/slf4j-jcl.jar +wrapper.java.classpath.21=/usr/share/java/slf4j/api.jar +wrapper.java.classpath.22=/usr/share/java/slf4j/jcl.jar wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar

1 0

Changes to 'refs/tags/spacewalk-java-1.9.52-1'
by Tomas Lestach 23 Jan '13

23 Jan '13

Tag 'spacewalk-java-1.9.52-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-01-23 15:23 +0000 Tagging package [spacewalk-java] version [1.9.52-1] in directory [java/]. Changes since cobbler20-2.0.11-7: Tomas Lestach (7): 889263 - enable paging on Software Channel Entitlements page 889263 - check for restricted POSTS even if CSRF check is bypassed 889263 - change wording for the restricted period related messages 902671 - unify restricted period length information at WebUI banner and notification e-mail 902673 - tell the user about restricted period, when notifying about certificate expiration add extra space to error message Automatic commit of package [spacewalk-java] release [1.9.52-1]. --- java/code/src/com/redhat/rhn/common/conf/Config.java | 2 java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 3 java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 5 + java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java | 41 ++++------ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 11 ++ java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java | 17 ++++ java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java | 16 +++ java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java | 24 ++++- java/spacewalk-java.spec | 12 ++ rel-eng/packages/spacewalk-java | 2 12 files changed, 103 insertions(+), 39 deletions(-) ---

1 0

7 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 23 Jan '13

23 Jan '13

java/code/src/com/redhat/rhn/common/conf/Config.java | 2 java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 3 java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 5 + java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java | 41 ++++------ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 11 ++ java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java | 17 ++++ java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java | 16 +++ java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java | 24 ++++- java/spacewalk-java.spec | 12 ++ rel-eng/packages/spacewalk-java | 2 12 files changed, 103 insertions(+), 39 deletions(-) New commits: commit c2b5ec39fdcbaea75588093621008bc6fa7baab8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Jan 23 16:23:14 2013 +0100 Automatic commit of package [spacewalk-java] release [1.9.52-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index dc93315..53397db 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.51 +Version: 1.9.52 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -659,6 +659,16 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Jan 23 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.52-1 +- add extra space to error message +- 902673 - tell the user about restricted period, when notifying about + certificate expiration +- 902671 - unify restricted period length information at WebUI banner and + notification e-mail +- 889263 - change wording for the restricted period related messages +- 889263 - check for restricted POSTS even if CSRF check is bypassed +- 889263 - enable paging on Software Channel Entitlements page + * Wed Jan 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.51-1 - use path compatible with slf4j >= 1.6 diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 00227a9..c98dd84 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.51-1 java/ +1.9.52-1 java/ commit 518b9b6be449f8705ffba2454e94a1c1b60498ea Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Jan 23 09:49:43 2013 +0100 add extra space to error message diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index dad76d3..b206fd8 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -451,7 +451,7 @@ public class Config { props.load(new FileInputStream(curr)); } catch (IOException e) { - logger.error("Could not parse file" + curr, e); + logger.error("Could not parse file " + curr, e); } String ns = makeNamespace(curr); logger.debug("Adding namespace: " + ns + " for file: " + commit 520f20bf55c408ed1c437de411077fb1650ba02b Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jan 22 16:40:27 2013 +0100 902673 - tell the user about restricted period, when notifying about certificate expiration diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index d4268f7..fe4b79c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -5166,7 +5166,7 @@ user before attempting to deactivate their account.</source> </context-group> </trans-unit> <trans-unit id="satellite.graceperiod"> - <source>Your satellite certificate has expired. Please contact Red Hat for a new certificate. Your satellite will become inactive in {0} day(s).</source> + <source>Your satellite certificate has expired. Please contact Red Hat for a new certificate. Your satellite enters restricted period in {0} day(s).</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/Login.do</context> <context context-type="sourcefile">/rhn/YourRhn.do</context> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml index e89579f..b47e494 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml @@ -299,7 +299,8 @@ Dear @@PRODUCT_NAME@@ User, This email is being sent to you to inform you that your @@PRODUCT_NAME@@ Certificate has expired on your {0} server. After {1} day(s) the systems -management services provided by your @@PRODUCT_NAME@@ Server will become inaccessible.</source> +management services provided by your @@PRODUCT_NAME@@ Server will be restricted for {2} days. +After that the services will become inaccessible.</source> <context-group name="ctx"> <context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context> <context context-type="paramnotes"> @@ -338,6 +339,14 @@ Thank you for using @@PRODUCT_NAME@@. <context context-type="sourcefile">Taskomatic: @@PRODUCT_NAME@@CertificateCheck</context> </context-group> </trans-unit> + <trans-unit id="email.satellitecert.restricted.body"> + <source> +Dear @@PRODUCT_NAME@@ User, + +This email is being sent to you to inform you that your @@PRODUCT_NAME@@ Certificate +has expired on your {0} server. Your Satellite is on day {1} of {2} day restricted period +and will soon stop functioning.</source> + </trans-unit> <trans-unit id="email.satellitecert.expired.body"> <source> Dear @@PRODUCT_NAME@@ User, diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java index 6fb4d4c..53b7c4d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java @@ -40,7 +40,20 @@ public class SatelliteCertificateCheck extends RhnJavaJob { CertificateManager man = CertificateManager.getInstance(); - if (man.isSatelliteCertExpired()) { + if (man.isSatelliteCertInRestrictedPeriod()) { + String[] dayProgress = man.getDayProgressInRestrictedPeriod(); + String body = ls.getMessage("email.satellitecert.restricted.body", + ConfigDefaults.get().getHostname(), dayProgress[0], dayProgress[1]); + if (ConfigDefaults.get().isSpacewalk()) { + body += ls.getMessage("email.satellitecert.spwbodyend"); + } + else { + body += ls.getMessage("email.satellitecert.satbodyend"); + } + sendMessage(ls.getMessage("email.satellitecert.expired.subject"), + body); + } + else if (man.isSatelliteCertExpired()) { String body = ls.getMessage("email.satellitecert.expired.body", ConfigDefaults.get().getHostname()); if (ConfigDefaults.get().isSpacewalk()) { @@ -53,9 +66,10 @@ public class SatelliteCertificateCheck extends RhnJavaJob { body); } else if (man.isSatelliteCertInGracePeriod()) { - Object[] args = new String[2]; + Object[] args = new String[3]; args[0] = ConfigDefaults.get().getHostname(); args[1] = new Long(man.getDaysLeftBeforeCertExpiration()).toString(); + args[2] = new Long(CertificateManager.RESTRICTED_PERIOD_IN_DAYS).toString(); String body = ls.getMessage("email.satellitecert.graceperiod.body", args); if (ConfigDefaults.get().isSpacewalk()) { body += ls.getMessage("email.satellitecert.spwbodyend"); commit c948493d04b5a9566973b30c05085b8bbbd50740 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jan 22 16:01:25 2013 +0100 902671 - unify restricted period length information at WebUI banner and notification e-mail diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java index b713480..6fb4d4c 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java @@ -53,13 +53,9 @@ public class SatelliteCertificateCheck extends RhnJavaJob { body); } else if (man.isSatelliteCertInGracePeriod()) { - long daysUntilExpiration = (man.getGracePeriodEndDate().getTime() - - System.currentTimeMillis()) / - 86400000; - Object[] args = new String[2]; args[0] = ConfigDefaults.get().getHostname(); - args[1] = new Long(daysUntilExpiration).toString(); + args[1] = new Long(man.getDaysLeftBeforeCertExpiration()).toString(); String body = ls.getMessage("email.satellitecert.graceperiod.body", args); if (ConfigDefaults.get().isSpacewalk()) { body += ls.getMessage("email.satellitecert.spwbodyend"); commit 61e7c38ef0a0bef8176778badf7232aa6f0249a7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jan 22 15:34:22 2013 +0100 889263 - change wording for the restricted period related messages 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 4ebb083..c0f4154 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java @@ -73,7 +73,8 @@ public class LoginAction extends RhnAction { CertificateManager cm = CertificateManager.getInstance(); if (cm.isSatelliteCertInRestrictedPeriod()) { - createErrorMessage(request, "satellite.expired.restricted", null); + createErrorMessageWithMultipleArgs(request, "satellite.expired.restricted", + cm.getDayProgressInRestrictedPeriod()); } else if (cm.isSatelliteCertExpired()) { addMessage(request, "satellite.expired"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java index 570c0c7..cc700c3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java @@ -79,7 +79,8 @@ public class LoginSetupAction extends RhnAction { CertificateManager man = CertificateManager.getInstance(); if (man.isSatelliteCertInRestrictedPeriod()) { - createErrorMessage(request, "satellite.expired.restricted", null); + createErrorMessageWithMultipleArgs(request, "satellite.expired.restricted", + man.getDayProgressInRestrictedPeriod()); } else if (man.isSatelliteCertExpired()) { addMessage(request, "satellite.expired"); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java index e74cca0..f27476f 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java @@ -97,7 +97,8 @@ public class AuthFilter implements Filter { return; } } - if (CertificateManager.getInstance().isSatelliteCertInRestrictedPeriod() && + CertificateManager cm = CertificateManager.getInstance(); + if (cm.isSatelliteCertInRestrictedPeriod() && !authenticationService.postOnRestrictedWhitelist(hreq)) { // interrupt the POST and redirect to the referer page URL url = getHttpRequestReferer(hreq); @@ -110,7 +111,8 @@ public class AuthFilter implements Filter { } log.warn("Blocking " + hreq.getRequestURI() + " POST in restricted period. Redirecting to " + pathUrl); - addErrorMessage(hreq, "restricted.forbidden"); + addErrorMessage(hreq, "restricted.forbidden", + cm.getDayProgressInRestrictedPeriod()); ((HttpServletResponse) response).sendRedirect(url.getFile()); return; } @@ -121,17 +123,11 @@ public class AuthFilter implements Filter { authenticationService.redirectToLogin((HttpServletRequest)request, (HttpServletResponse)response); } - -// if (log.isDebugEnabled()) { -// log.debug("EXIT AuthFilter.doFilter: " + request.getRemoteAddr() + -// " [" + new Date() + "] (" + -// ((HttpServletRequest)(request)).getRequestURI() + ")"); -// } } - private void addErrorMessage(HttpServletRequest hreq, String msgKey) { + private void addErrorMessage(HttpServletRequest hreq, String msgKey, String[] args) { ActionMessages ams = new ActionMessages(); - ams.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey)); + ams.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey, args)); hreq.getSession().setAttribute(Globals.ERROR_KEY, ams); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 7be87d5..d4268f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -5160,7 +5160,7 @@ user before attempting to deactivate their account.</source> </context-group> </trans-unit> <trans-unit id="satellite.expired.restricted"> - <source>Your satellite certificate has expired. Please contact Red Hat for a new certificate. Till then your satellite will have restricted functionality.</source> + <source>Your Satellite Certificate has expired. Your Satellite is on day {0} of {1} day restricted period and will soon stop functioning. Please contact Red Hat for a new certificate.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/Login.do</context> </context-group> @@ -5173,7 +5173,7 @@ user before attempting to deactivate their account.</source> </context-group> </trans-unit> <trans-unit id="restricted.forbidden"> - <source>You are not allowed to perform this action until your certificate is renewed. Please contact Red Hat for a new certificate. Till then your satellite will have restricted functionality.</source> + <source>You are not allowed to perform this action until your Satellite Certificate is renewed. Your Satellite is on day {0} of the {1} restricted period and will soon stop functioning. Please contact Red Hat for a new certificate.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/Login.do</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java index 0d77d69..ddc72ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java @@ -226,6 +226,23 @@ public abstract class RhnAction extends Action { } /** + * Add an error message to the request with argument array + * @param req to add the message to + * @param beanKey resource key to lookup + * @param args String array to fill in for the message parameters + */ + protected void createErrorMessageWithMultipleArgs(HttpServletRequest req, + String beanKey, String[] args) { + ActionErrors errs = new ActionErrors(); + String[] escArgs = new String[args.length]; + for (int i = 0; i < args.length; i++) { + escArgs[i] = StringEscapeUtils.escapeHtml(args[i]); + } + errs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(beanKey, escArgs)); + saveMessages(req, errs); + } + + /** * Add a message to the set of ActionMessages. Takes the key, constructs * a new ActionMessage object and adds it to the ActionMessages collection * passed in. diff --git a/java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java b/java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java index 33543f3..0ef3b31 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/CertificateManager.java @@ -134,7 +134,10 @@ public class CertificateManager extends BaseManager { * */ public long getDaysLeftBeforeCertExpiration() { - long endTime = getGracePeriodEndDate().getTime(); + return getDaysLeftBefore(getGracePeriodEndDate().getTime()); + } + + private long getDaysLeftBefore(long endTime) { Calendar cal = Calendar.getInstance(); cal.set(Calendar.HOUR, 0); cal.set(Calendar.MINUTE, 0); @@ -143,4 +146,15 @@ public class CertificateManager extends BaseManager { cal.set(Calendar.AM_PM, Calendar.AM); return (endTime - cal.getTime().getTime()) / MILLISECONDS_IN_DAY; } + + /** + * @return the number of the days left before the restricted period finishes + */ + public String[] getDayProgressInRestrictedPeriod() { + String[] progress = new String[2]; + progress[0] = new Long(RESTRICTED_PERIOD_IN_DAYS - + getDaysLeftBefore(getRestrictedPeriodEndDate().getTime()) + 1).toString(); + progress[1] = new Long(RESTRICTED_PERIOD_IN_DAYS).toString(); + return progress; + } } commit 4f1d8d87c19a162c8a994873900197d705bdeef3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jan 22 14:16:57 2013 +0100 889263 - check for restricted POSTS even if CSRF check is bypassed 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 7f0014c..d931cc2 100644 --- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java +++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java @@ -71,6 +71,9 @@ public class PxtAuthenticationService extends BaseAuthenticationService { POST_UNPROTECTED_URIS = UnmodifiableSet.decorate(set); set = new TreeSet(); + // login + set.add("/rhn/Login"); + set.add("/rhn/ReLogin"); // base and add on entitlements set.add("/rhn/systems/details/Edit.do"); set.add("/rhn/systems/SystemEntitlementsSubmit.do"); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java index 97272c6..e74cca0 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java @@ -82,19 +82,20 @@ public class AuthFilter implements Filter { HttpServletRequest hreq = new RhnHttpServletRequest((HttpServletRequest)request); - // validate security token to prevent CSRF type of attacks - if (hreq.getMethod().equals("POST") && - !authenticationService.skipCsfr((HttpServletRequest) request)) { - try { - CSRFTokenValidator.validate(hreq); - } - catch (CSRFTokenException e) { - // send HTTP 403 if security token validation failed - HttpServletResponse hres = (HttpServletResponse) response; - hres.sendError(HttpServletResponse.SC_FORBIDDEN, - e.getMessage()); - return; + if (hreq.getMethod().equals("POST")) { + // validate security token to prevent CSRF type of attacks + if (!authenticationService.skipCsfr((HttpServletRequest) request)) { + try { + CSRFTokenValidator.validate(hreq); + } + catch (CSRFTokenException e) { + // send HTTP 403 if security token validation failed + HttpServletResponse hres = (HttpServletResponse) response; + hres.sendError(HttpServletResponse.SC_FORBIDDEN, + e.getMessage()); + return; + } } if (CertificateManager.getInstance().isSatelliteCertInRestrictedPeriod() && !authenticationService.postOnRestrictedWhitelist(hreq)) { commit b613560dc2c3796d9ef680f5d96351b8331ae491 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jan 22 14:07:46 2013 +0100 889263 - enable paging on Software Channel Entitlements page 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 479fe21..7f0014c 100644 --- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java +++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java @@ -78,6 +78,8 @@ public class PxtAuthenticationService extends BaseAuthenticationService { set.add("/rhn/admin/multiorg/OrgSystemSubscriptions.do"); // org software channel entitlements set.add("/rhn/admin/multiorg/OrgSoftwareSubscriptions.do"); + // satellite software channel entitlements + set.add("/rhn/channels/software/EntitlementsSubmit.do"); // delete system(s) set.add("/rhn/systems/details/DeleteConfirm.do"); set.add("/rhn/systems/ssm/DeleteConfirm.do");

1 0

Changes to 'refs/tags/cobbler20-2.0.11-7'
by Jan Pazdziora 23 Jan '13

23 Jan '13

Tag 'cobbler20-2.0.11-7' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-23 13:56 +0000 Tagging package [cobbler20] version [2.0.11-7] in directory [spec-tree/cobbler20/]. Changes since spacewalk-schema-1.9.17-1: Jan Pazdziora (2): Move to mod_wsgi both on Fedoras and on RHEL 5. Automatic commit of package [cobbler20] minor release [2.0.11-7]. --- rel-eng/packages/cobbler20 | 2 +- spec-tree/cobbler20/cobbler20.spec | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) ---

1 0

2 commits - rel-eng/packages spec-tree/cobbler20
by Jan Pazdziora 23 Jan '13

23 Jan '13

rel-eng/packages/cobbler20 | 2 +- spec-tree/cobbler20/cobbler20.spec | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) New commits: commit 76f8a5bf6580135698fc64700de9a6c55d05eea4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jan 23 14:56:13 2013 +0100 Automatic commit of package [cobbler20] minor release [2.0.11-7]. diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20 index d5ec2ce..6d0e7f8 100644 --- a/rel-eng/packages/cobbler20 +++ b/rel-eng/packages/cobbler20 @@ -1 +1 @@ -2.0.11-6 spec-tree/cobbler20/ +2.0.11-7 spec-tree/cobbler20/ diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec index 25c917f..2d54b7c 100644 --- a/spec-tree/cobbler20/cobbler20.spec +++ b/spec-tree/cobbler20/cobbler20.spec @@ -7,7 +7,7 @@ Name: cobbler20 License: GPLv2+ AutoReq: no Version: 2.0.11 -Release: 6%{?dist} +Release: 7%{?dist} Source0: cobbler-%{version}.tar.gz Patch0: catch_cheetah_exception.patch Group: Applications/System @@ -418,6 +418,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf %doc AUTHORS COPYING CHANGELOG README %changelog +* Wed Jan 23 2013 Jan Pazdziora 2.0.11-7 +- Move to mod_wsgi both on Fedoras and on RHEL 5. + * Mon Nov 12 2012 Tomas Lestach <tlestach(a)redhat.com> 2.0.11-6 - 866326 - catch xmlrpclib.Fault instead of general Exception in cobbler's mod_python/mod_wsgi commit 75db64b8d9093d82c6a96a0c12c6c26c5f081f12 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jan 23 14:55:54 2013 +0100 Move to mod_wsgi both on Fedoras and on RHEL 5. diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec index 89cbccb..25c917f 100644 --- a/spec-tree/cobbler20/cobbler20.spec +++ b/spec-tree/cobbler20/cobbler20.spec @@ -25,11 +25,7 @@ Requires: httpd Requires: tftp-server %endif -%if 0%{?rhel} >= 6 Requires: mod_wsgi -%else -Requires: mod_python -%endif Requires: createrepo %if 0%{?fedora} >= 11 @@ -237,13 +233,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %if 0%{?suse_version} >= 1000 %config(noreplace) /etc/apache2/conf.d/cobbler.conf %else -%if 0%{?rhel} >= 6 %config(noreplace) /etc/httpd/conf.d/cobbler_wsgi.conf %exclude /etc/httpd/conf.d/cobbler.conf -%else -%config(noreplace) /etc/httpd/conf.d/cobbler.conf -%exclude /etc/httpd/conf.d/cobbler_wsgi.conf -%endif %endif %dir /var/log/cobbler/syslog

1 0

Changes to 'refs/tags/spacewalk-schema-1.9.17-1'
by Jan Pazdziora 23 Jan '13

23 Jan '13

Tag 'spacewalk-schema-1.9.17-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-23 10:31 +0000 Tagging package [spacewalk-schema] version [1.9.17-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-1.9.51-1: Jan Pazdziora (2): Avoid exceeding maximal identifier length. Automatic commit of package [spacewalk-schema] release [1.9.17-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql | 2 +- schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql | 8 ++++---- schema/spacewalk/spacewalk-schema.spec | 5 ++++- schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle | 2 +- schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql | 8 ++++---- 6 files changed, 15 insertions(+), 12 deletions(-) ---

1 0

2 commits - rel-eng/packages schema/spacewalk
by Jan Pazdziora 23 Jan '13

23 Jan '13

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql | 2 +- schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql | 8 ++++---- schema/spacewalk/spacewalk-schema.spec | 5 ++++- schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle | 2 +- schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql | 8 ++++---- 6 files changed, 15 insertions(+), 12 deletions(-) New commits: commit aee29e680f3323151c6eef016aeaa366e7349af2 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jan 23 11:31:22 2013 +0100 Automatic commit of package [spacewalk-schema] release [1.9.17-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 4a68194..b641793 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.9.16-1 schema/spacewalk/ +1.9.17-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index f211c70..a31ea7a 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.9.16 +Version: 1.9.17 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Wed Jan 23 2013 Jan Pazdziora 1.9.17-1 +- Avoid exceeding maximal identifier length. + * Tue Jan 22 2013 Jan Pazdziora 1.9.16-1 - We need to drop rhn_download_id_seq as well. - We need to recreate the view from scratch. commit a10b37c840b933f1130bab07fe7bfa76b5c0eae5 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jan 23 11:30:11 2013 +0100 Avoid exceeding maximal identifier length. Addressing rhn_content_source_ssl_mod_trig * ERROR at line 2: ORA-00972: identifier is too long diff --git a/schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql b/schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql index 10376b0..6b0cd9b 100644 --- a/schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql +++ b/schema/spacewalk/oracle/triggers/rhnContentSourceSsl.sql @@ -14,7 +14,7 @@ -- create or replace trigger -rhn_content_source_ssl_mod_trig +rhn_cont_source_ssl_mod_trig before insert or update on rhnContentSourceSsl for each row begin diff --git a/schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql b/schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql index 7ec289b..2df6026 100644 --- a/schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql +++ b/schema/spacewalk/postgres/triggers/rhnContentSourceSsl.sql @@ -1,6 +1,6 @@ --- oracle equivalent source sha1 2330953d139fc07f77743e6bc63abb49d0a2d147 +-- oracle equivalent source sha1 69c5d82c00ea96836eed1be6a65507f53b7730f3 -create or replace function rhn_content_source_ssl_mod_trig_fun() returns trigger as +create or replace function rhn_cont_source_ssl_mod_trig_fun() returns trigger as $$ begin new.modified := current_timestamp; @@ -10,7 +10,7 @@ $$ language plpgsql; create trigger -rhn_content_source_ssl_mod_trig +rhn_cont_source_ssl_mod_trig before insert or update on rhnContentSourceSsl for each row -execute procedure rhn_content_source_ssl_mod_trig_fun(); +execute procedure rhn_cont_source_ssl_mod_trig_fun(); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle index 10376b0..6b0cd9b 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.oracle @@ -14,7 +14,7 @@ -- create or replace trigger -rhn_content_source_ssl_mod_trig +rhn_cont_source_ssl_mod_trig before insert or update on rhnContentSourceSsl for each row begin diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql index 7ec289b..2df6026 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/009-rhn_content_source_ssl_mod_trig.sql.postgresql @@ -1,6 +1,6 @@ --- oracle equivalent source sha1 2330953d139fc07f77743e6bc63abb49d0a2d147 +-- oracle equivalent source sha1 69c5d82c00ea96836eed1be6a65507f53b7730f3 -create or replace function rhn_content_source_ssl_mod_trig_fun() returns trigger as +create or replace function rhn_cont_source_ssl_mod_trig_fun() returns trigger as $$ begin new.modified := current_timestamp; @@ -10,7 +10,7 @@ $$ language plpgsql; create trigger -rhn_content_source_ssl_mod_trig +rhn_cont_source_ssl_mod_trig before insert or update on rhnContentSourceSsl for each row -execute procedure rhn_content_source_ssl_mod_trig_fun(); +execute procedure rhn_cont_source_ssl_mod_trig_fun();

1 0

Changes to 'refs/tags/spacewalk-java-1.9.51-1'
by Michael Mraka 23 Jan '13

23 Jan '13

Tag 'spacewalk-java-1.9.51-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-23 09:45 +0000 Tagging package [spacewalk-java] version [1.9.51-1] in directory [java/]. Changes since spacewalk-schema-1.9.16-1: Michael Mraka (2): use path compatible with slf4j >= 1.6 Automatic commit of package [spacewalk-java] release [1.9.51-1]. --- java/conf/default/rhn_taskomatic_daemon.conf | 4 ++-- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

2 commits - java/conf java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 23 Jan '13

23 Jan '13

java/conf/default/rhn_taskomatic_daemon.conf | 4 ++-- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 1ab29fabd3ed9618f821780f6a767c7f151c2aa9 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Jan 23 10:45:50 2013 +0100 Automatic commit of package [spacewalk-java] release [1.9.51-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 9a60447..dc93315 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.50 +Version: 1.9.51 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -659,6 +659,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Jan 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.51-1 +- use path compatible with slf4j >= 1.6 + * Tue Jan 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.50-1 - removing unused PageControl parameter - 896015 - dissociate duplicate system set from SSM diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 5603c00..00227a9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.9.50-1 java/ +1.9.51-1 java/ commit 23d4c869dd8388be4c4175d28353c542cc6ba90e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Jan 23 10:40:53 2013 +0100 use path compatible with slf4j >= 1.6 fixing FATAL | jvm 1 | 2013/01/23 09:25:08 | org/slf4j/LoggerFactory java.lang.NoClassDefFoundError: org/slf4j/LoggerFactory diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf index 875cd29..f546656 100644 --- a/java/conf/default/rhn_taskomatic_daemon.conf +++ b/java/conf/default/rhn_taskomatic_daemon.conf @@ -73,8 +73,8 @@ wrapper.java.classpath.49=/usr/share/java/hibernate3.jar wrapper.java.classpath.50=/usr/share/java/cglib.jar wrapper.java.classpath.51=/usr/share/java/dom4j.jar wrapper.java.classpath.52=/usr/share/rhn/lib/java-branding.jar -wrapper.java.classpath.53=/usr/share/java/slf4j-api.jar -wrapper.java.classpath.54=/usr/share/java/slf4j-jcl.jar +wrapper.java.classpath.53=/usr/share/java/slf4j/api.jar +wrapper.java.classpath.54=/usr/share/java/slf4j/jcl.jar wrapper.java.classpath.55=/usr/share/java/simple-core.jar wrapper.java.classpath.56=/usr/share/java/commons-dbcp.jar wrapper.java.classpath.57=/usr/share/java/commons-pool.jar

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits January 2013