client/tools rel-eng/packages
by Jan Pazdziora
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 5 ++++-
rel-eng/packages/spacewalk-remote-utils | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3e9b7232d4a9dc4f37164348581b5571221d595d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 28 13:33:36 2012 +0200
Automatic commit of package [spacewalk-remote-utils] release [1.8.4-1].
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index 1314259..a8c98a9 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -4,7 +4,7 @@
%endif
Name: spacewalk-remote-utils
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
Summary: Utilities to interact with a RHN Satellite or Spacewalk server remotely.
@@ -58,6 +58,9 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp
%doc %{_mandir}/man1/spacewalk-create-channel.1.gz
%changelog
+* Tue Aug 28 2012 Jan Pazdziora 1.8.4-1
+- Fixing the License rpm header to match the COPYING information.
+
* Fri Aug 10 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.3-1
- adding optional and supplementary RHEL6.3 channel definitions
- Revert "add missing optional and supplementary channel definitions"
diff --git a/rel-eng/packages/spacewalk-remote-utils b/rel-eng/packages/spacewalk-remote-utils
index d3cb1f5..22c46b3 100644
--- a/rel-eng/packages/spacewalk-remote-utils
+++ b/rel-eng/packages/spacewalk-remote-utils
@@ -1 +1 @@
-1.8.3-1 client/tools/spacewalk-remote-utils/
+1.8.4-1 client/tools/spacewalk-remote-utils/
11 years, 8 months
client/tools
by Jan Pazdziora
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 872b10d43994643d7e2d344a6aa58ed33194d70d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 28 13:32:51 2012 +0200
Fixing the License rpm header to match the COPYING information.
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index e340909..1314259 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -9,7 +9,7 @@ Release: 1%{?dist}
Summary: Utilities to interact with a RHN Satellite or Spacewalk server remotely.
Group: Applications/System
-License: GPLv3+
+License: GPLv2
URL: http://fedorahosted.org/spacewalk
Source: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
11 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 31fc7f49fd0872502f249d035a40279ffd8d9d00
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 28 09:46:05 2012 +0200
fix ContentSourceFilter.findBySourceId to return list of ContentSourceFilter objects
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml
index 43e4a4e..609f4a3 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml
@@ -22,8 +22,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
<query name="ContentSourceFilter.findBySourceId">
- <![CDATA[SELECT f.sortOrder, f.flag, f.filter
- FROM com.redhat.rhn.domain.channel.ContentSourceFilter AS f
+ <![CDATA[FROM com.redhat.rhn.domain.channel.ContentSourceFilter AS f
WHERE f.sourceId = :source_id
ORDER BY f.sortOrder]]>
</query>
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.136-1'
by aparsons
Tag 'spacewalk-java-1.8.136-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2012-08-28 04:45 +0000
Tagging package [spacewalk-java] version [1.8.136-1] in directory [java/].
Changes since spacewalk-backend-1.8.63-1:
Aron Parsons (5):
add ContentSourceFilter class
add serializer for ContentSourceFilter
add lookupContentSourceFiltersById method to ChannelFactory
add listRepoFilters API call
Automatic commit of package [spacewalk-java] release [1.8.136-1].
Stephen Herr (1):
852048 - fix typo in db-control man page
---
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 11 +
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml | 30 +++
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.java | 99 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 27 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 63 ++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java | 1
java/spacewalk-java.spec | 16 +
rel-eng/packages/spacewalk-java | 2
web/modules/dobby/scripts/db-control | 2
9 files changed, 248 insertions(+), 3 deletions(-)
---
11 years, 8 months
5 commits - java/code java/spacewalk-java.spec rel-eng/packages
by aparsons
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 11 +
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml | 30 +++
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.java | 99 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 27 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 63 ++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java | 1
java/spacewalk-java.spec | 16 +
rel-eng/packages/spacewalk-java | 2
8 files changed, 247 insertions(+), 2 deletions(-)
New commits:
commit 4b11bb0e2e480936ecc8a0386c5148d8ea941d4f
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Tue Aug 28 00:45:39 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.136-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 74eea99..319696b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.134
+Version: 1.8.136
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,20 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 28 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.136-1
+- add listRepoFilters API call
+- add lookupContentSourceFiltersById method to ChannelFactory
+- add serializer for ContentSourceFilter
+- add ContentSourceFilter class
+- 733420 - Checking user permissions for CryptoKeysHandler
+
+* Tue Aug 28 2012 Aron Parsons <aronparsons(a)gmail.com>
+- add listRepoFilters API call
+- add lookupContentSourceFiltersById method to ChannelFactory
+- add serializer for ContentSourceFilter
+- add ContentSourceFilter class
+- 733420 - Checking user permissions for CryptoKeysHandler
+
* Fri Aug 24 2012 Stephen Herr <sherr(a)redhat.com> 1.8.134-1
- 818700 - allow user to set the gateway for static bonds
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b805bf3..68e2557 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.134-1 java/
+1.8.136-1 java/
commit 78e04edac79095c52849f300f0a3f170da0a0db7
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Tue Aug 28 00:39:11 2012 -0400
add listRepoFilters API call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index b108f00..3e76fe1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelArch;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ContentSource;
+import com.redhat.rhn.domain.channel.ContentSourceFilter;
import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
import com.redhat.rhn.domain.channel.NewChannelHelper;
import com.redhat.rhn.domain.errata.Errata;
@@ -2719,6 +2720,32 @@ public class ChannelSoftwareHandler extends BaseHandler {
return cronExpr;
}
+ /**
+ * Lists the filters for a repo
+ * @param sessionKey Session containing user information.
+ * @param label of the repo to use
+ * @return list of filters
+ *
+ * @xmlrpc.doc Lists the filters for a repo
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "label", "repository label")
+ * @xmlrpc.returntype
+ * #array()
+ * $ContentSourceFilterSerializer
+ * #array_end()
+ *
+ **/
+ public List<ContentSourceFilter> listRepoFilters(String sessionKey, String label) {
+ User user = getLoggedInUser(sessionKey);
+
+ ContentSource cs = lookupContentSourceByLabel(label, user.getOrg());
+
+ List<ContentSourceFilter> result =
+ ChannelFactory.lookupContentSourceFiltersById(cs.getId());
+
+ return result;
+ }
+
private ContentSource lookupContentSourceById(Long repoId, Org org) {
ContentSource cs = ChannelFactory.lookupContentSource(repoId, org);
if (cs == null) {
commit 53263b05c791e4450ec7e34b8f6e3d45852d1640
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Tue Aug 28 00:38:47 2012 -0400
add lookupContentSourceFiltersById method to ChannelFactory
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 9e8d93b..5982bca 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -188,6 +188,17 @@ public class ChannelFactory extends HibernateFactory {
}
+ /**
+ * Lookup a content source's filters by id
+ * @param id source id
+ * @return the ContentSourceFilters
+ */
+ public static List<ContentSourceFilter> lookupContentSourceFiltersById(Long id) {
+ Map params = new HashMap();
+ params.put("source_id", id);
+ return singleton.listObjectsByNamedQuery(
+ "ContentSourceFilter.findBySourceId", params);
+ }
/**
* Retrieve a list of channel ids associated with the labels provided
commit ad74aa7f79a9730ae7b67cce88cf152fffc839e6
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Tue Aug 28 00:37:58 2012 -0400
add serializer for ContentSourceFilter
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java
new file mode 100644
index 0000000..a4aba0c
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2009--2012 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.xmlrpc.serializer;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import redstone.xmlrpc.XmlRpcCustomSerializer;
+import redstone.xmlrpc.XmlRpcException;
+import redstone.xmlrpc.XmlRpcSerializer;
+
+import com.redhat.rhn.domain.channel.ContentSourceFilter;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
+/**
+ *
+ * ContentSourceFilterSerializer
+ * @version $Rev$
+ *
+ * @xmlrpc.doc
+ * #struct("filter")
+ * #prop("int", "sortOrder")
+ * #prop("string", "filter")
+ * #prop("string", "flag")
+ * #struct_end()
+ *
+ */
+public class ContentSourceFilterSerializer implements XmlRpcCustomSerializer {
+
+ /**
+ * {@inheritDoc}
+ */
+ public Class getSupportedClass() {
+ return ContentSourceFilter.class;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ throws XmlRpcException, IOException {
+ SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ ContentSourceFilter filter = (ContentSourceFilter) value;
+
+ helper.add("sortOrder", filter.getSortOrder());
+ helper.add("filter", filter.getFilter());
+ helper.add("flag", filter.getFlag());
+
+ helper.writeTo(output);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java
index eb8b5c9..9d3716b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java
@@ -116,6 +116,7 @@ public class SerializerRegistry {
SERIALIZER_CLASSES.add(NetworkDtoSerializer.class);
SERIALIZER_CLASSES.add(DistChannelMapSerializer.class);
SERIALIZER_CLASSES.add(ContentSourceSerializer.class);
+ SERIALIZER_CLASSES.add(ContentSourceFilterSerializer.class);
SERIALIZER_CLASSES.add(XccdfTestResultDtoSerializer.class);
SERIALIZER_CLASSES.add(XccdfTestResultSerializer.class);
SERIALIZER_CLASSES.add(XccdfRuleResultDtoSerializer.class);
commit fb0914444b6a20074fc861840952091e36b10c06
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Tue Aug 28 00:36:07 2012 -0400
add ContentSourceFilter class
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml
new file mode 100644
index 0000000..43e4a4e
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping
+PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+ <class name="com.redhat.rhn.domain.channel.ContentSourceFilter"
+ table="rhnContentSourceFilter" >
+
+ <id name="id" type="long" column="id">
+ <meta attribute="scope-set">protected</meta>
+ <generator class="sequence">
+ <param name="sequence">rhn_csf_id_seq</param>
+ </generator>
+ </id>
+
+ <property name="sourceId" type="long" column="source_id"/>
+ <property name="filter" type="string" column="filter"/>
+ <property name="flag" type="string" column="flag"/>
+ <property name="sortOrder" type="int" column="sort_order"/>
+ <property name="created" type="timestamp" column="created" insert="false" update="false" />
+ <property name="modified" type="timestamp" column="modified" insert="false" update="false" />
+ </class>
+
+ <query name="ContentSourceFilter.findBySourceId">
+ <![CDATA[SELECT f.sortOrder, f.flag, f.filter
+ FROM com.redhat.rhn.domain.channel.ContentSourceFilter AS f
+ WHERE f.sourceId = :source_id
+ ORDER BY f.sortOrder]]>
+ </query>
+</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.java b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.java
new file mode 100644
index 0000000..ff16e41
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2009--2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.domain.channel;
+
+import com.redhat.rhn.domain.BaseDomainHelper;
+
+/**
+ * ContentSourceFilter
+ * @version $Rev$
+ */
+public class ContentSourceFilter extends BaseDomainHelper {
+ private Long id;
+ private Long sourceId;
+ private String flag;
+ private String filter;
+ private int sortOrder;
+
+ /**
+ * @return Returns the id.
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * @param idIn The id to set.
+ */
+ public void setId(Long idIn) {
+ this.id = idIn;
+ }
+
+ /**
+ * @return Returns the sourceId.
+ */
+ public Long getSourceId() {
+ return sourceId;
+ }
+
+ /**
+ * @param sourceIdIn The sourceId to set.
+ */
+ public void setSourceId(Long sourceIdIn) {
+ this.sourceId = sourceIdIn;
+ }
+
+ /**
+ * @return Returns the flag.
+ */
+ public String getFlag() {
+ return flag;
+ }
+
+ /**
+ * @param flagIn The flag to set.
+ */
+ public void setFlag(String flagIn) {
+ this.flag = flagIn;
+ }
+
+ /**
+ * @return Returns the filter.
+ */
+ public String getFilter() {
+ return filter;
+ }
+
+ /**
+ * @param filterIn The filter to set.
+ */
+ public void setFilter(String filterIn) {
+ this.filter = filterIn;
+ }
+
+ /**
+ * @return Returns the sortOrder.
+ */
+ public int getSortOrder() {
+ return sortOrder;
+ }
+
+ /**
+ * @param sortOrderIn The sortOrder to set.
+ */
+ public void setSortOrder(int sortOrderIn) {
+ this.sortOrder = sortOrderIn;
+ }
+}
11 years, 8 months
web/modules
by StephenHerr
web/modules/dobby/scripts/db-control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dca23b25cbeca3319c41edadaf21e808e7615b54
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Aug 27 11:44:37 2012 -0400
852048 - fix typo in db-control man page
diff --git a/web/modules/dobby/scripts/db-control b/web/modules/dobby/scripts/db-control
index 94a3cce..19e88fc 100755
--- a/web/modules/dobby/scripts/db-control
+++ b/web/modules/dobby/scripts/db-control
@@ -104,7 +104,7 @@ Before restoring, the files in DIRNAME are verified. Once all files are verifie
=item B<shrink-segments>
-Determines and shrinks database segments with signifcant amount of free space.
+Determines and shrinks database segments with significant amount of free space.
=item B<start>
11 years, 8 months
Changes to 'refs/tags/spacewalk-backend-1.8.63-1'
by StephenHerr
Tag 'spacewalk-backend-1.8.63-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-08-27 15:04 +0000
Tagging package [spacewalk-backend] version [1.8.63-1] in directory [backend/].
Changes since spacewalk-setup-jabberd-1.8.5-1:
Stephen Herr (2):
848475 - Adding IPv6 ip-address detection to proxy auth fix
Automatic commit of package [spacewalk-backend] release [1.8.63-1].
Tomas Kasparek (1):
733420 - Checking user permissions for CryptoKeysHandler
---
backend/server/apacheAuth.py | 9 +++++++--
backend/spacewalk-backend.spec | 5 ++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 8 ++++++++
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
---
11 years, 8 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/server/apacheAuth.py | 9 +++++++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 888b51f267d06e780fa19e39f319531f52d44d4b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Aug 27 11:04:19 2012 -0400
Automatic commit of package [spacewalk-backend] release [1.8.63-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c7e00b1..ed54ec1 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.62
+Version: 1.8.63
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -647,6 +647,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Aug 27 2012 Stephen Herr <sherr(a)redhat.com> 1.8.63-1
+- 848475 - Adding IPv6 ip-address detection to proxy auth fix
+
* Sun Aug 26 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.62-1
- add --no-errata option to spacewalk-repo-sync
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e525103..627daee 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.62-1 backend/
+1.8.63-1 backend/
commit 4b4c1147351dd2c210d1d907ec53f47cd71e9914
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Aug 27 11:03:56 2012 -0400
848475 - Adding IPv6 ip-address detection to proxy auth fix
diff --git a/backend/server/apacheAuth.py b/backend/server/apacheAuth.py
index 82b66f2..12d0962 100644
--- a/backend/server/apacheAuth.py
+++ b/backend/server/apacheAuth.py
@@ -50,8 +50,13 @@ def _verifyProxyAuthToken(auth_token):
log_debug(4, auth_token)
token, hostname = splitProxyAuthToken(auth_token)
hostname = hostname.strip()
- ip_regex = '^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$'
- hostname_is_ip_address = re.match(ip_regex, hostname)
+ ipv4_regex = '^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$'
+ # This ipv6 regex was develeoped by Stephen Ryan at Dataware.
+ # (http://forums.intermapper.com/viewtopic.php?t=452) It is licenced
+ # under a Creative Commons Attribution-ShareAlike 3.0 Unported
+ # License, so we are free to use it as long as we attribute it to him.
+ ipv6_regex = '^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-
f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?$'
+ hostname_is_ip_address = re.match(ipv4_regex, hostname) or re.match(ipv6_regex, hostname)
headers = rhnFlags.get('outputTransportOptions')
if len(token) < 5:
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.135-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.8.135-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2012-08-27 14:26 +0000
Tagging package [spacewalk-java] version [1.8.135-1] in directory [java/].
Changes since spacewalk-setup-jabberd-1.8.5-1:
Tomas Kasparek (2):
733420 - Checking user permissions for CryptoKeysHandler
Automatic commit of package [spacewalk-java] release [1.8.135-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 8 ++++++++
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
11 years, 8 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 1dae339f2c4ef314436bddc3bf9364dbf526bacd
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Aug 27 16:13:04 2012 +0200
733420 - Checking user permissions for CryptoKeysHandler
Added calls of ensureOrgOrConfigAdmin so CryptoKeysHandler methods are only available to org or config admins.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
index 7bd5b8b..426cdf2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
@@ -63,6 +63,8 @@ public class CryptoKeysHandler extends BaseHandler {
throw new NoSuchUserException();
}
+ ensureOrgOrConfigAdmin(loggedInUser);
+
Org org = loggedInUser.getOrg();
KickstartLister lister = KickstartLister.getInstance();
@@ -95,6 +97,8 @@ public class CryptoKeysHandler extends BaseHandler {
throw new NoSuchUserException();
}
+ ensureOrgOrConfigAdmin(loggedInUser);
+
Org org = loggedInUser.getOrg();
CreateCryptoKeyCommand command = new CreateCryptoKeyCommand(org);
command.setType(type);
@@ -129,6 +133,8 @@ public class CryptoKeysHandler extends BaseHandler {
throw new NoSuchUserException();
}
+ ensureOrgOrConfigAdmin(loggedInUser);
+
DeleteCryptoKeyCommand command =
new DeleteCryptoKeyCommand(loggedInUser, description);
@@ -201,6 +207,8 @@ public class CryptoKeysHandler extends BaseHandler {
public CryptoKey getDetails(String sessionKey, String description) {
User loggedInUser = getLoggedInUser(sessionKey);
+ ensureOrgOrConfigAdmin(loggedInUser);
+
EditCryptoKeyCommand command = new EditCryptoKeyCommand(loggedInUser, description);
CryptoKey key = command.getCryptoKey();
11 years, 8 months