java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 13740bdb1cadd12351f898f8978260fbbb81c4b0
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Sat Nov 5 17:12:14 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.73-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index bebf919..85d440c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.72
+Version: 1.6.73
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Sat Nov 05 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.73-1
+- 725050 - fix activationkey.[gs]etDetails apidoc (slukasik(a)redhat.com)
+
* Fri Nov 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.72-1
- 723528 - fix template attribute type in kickstart.profile API documentation
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 95f2020..b4f74b8 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.72-1 java/
+1.6.73-1 java/
12 years, 7 months
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 1 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 1 +
2 files changed, 2 insertions(+)
New commits:
commit 18864d0099a1dd12b947e2cf0fba0d7bd4f0a3b8
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Sat Nov 5 16:21:49 2011 +0100
725050 - fix activationkey.[gs]etDetails apidoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index f3ff1f7..b9b8d80 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -282,6 +282,7 @@ public class ActivationKeyHandler extends BaseHandler {
* #prop_desc("boolean", "unlimited_usage_limit", "Set true
* for unlimited usage and to override usage_limit")
* #prop_desc("boolean", "universal_default", "optional")
+ * #prop_desc("boolean", "disabled", "optional")
* #struct_end()
* @xmlrpc.returntype #return_int_success()
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
index 2b5efa4..f6ad933 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
@@ -46,6 +46,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
* #prop_array_end()
* #prop("boolean", "universal_default")
+ * #prop("boolean", "disabled")
* #struct_end()
*/
public class ActivationKeySerializer implements XmlRpcCustomSerializer {
12 years, 7 months
5 commits - backend/spacewalk-backend.spec client/tools rel-eng/packages schema/spacewalk spacewalk/config spacewalk/setup
by Milan Zazrivec
backend/spacewalk-backend.spec | 5 ++++-
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-config | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
spacewalk/config/spacewalk-config.spec | 5 ++++-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
10 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit a377904aeeeb641f2caff28be205177d82d97d5d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:26:41 2011 +0100
Automatic commit of package [spacewalk-config] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 0f88471..eb69de1 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.6.3-1 spacewalk/config/
+1.6.4-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 0b5537c..d5d08cf 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -105,6 +105,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.4-1
+- 679335 - remove osa-dispatcher login credentials from rhn.conf
+
* Mon Oct 03 2011 Jan Pazdziora 1.6.3-1
- 621531 - fixing rhn.conf(5) man page.
commit 9c5aea5a32cab914ed80f34d3fc62f1560e47e42
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:26:13 2011 +0100
Automatic commit of package [osad] release [5.10.25-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 9ad7da2..2e7293e 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.24
+Version: 5.10.25
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.25-1
+- 679335 - store osa-dispatcher jabber password in DB
+
* Fri Oct 21 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.24-1
- 679353 - automatically detect system re-registration
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index ec50aaa..aa2b018 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.24-1 client/tools/osad/
+5.10.25-1 client/tools/osad/
commit 2c390069f956883fab00a2874334856329b9361e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:25:53 2011 +0100
Automatic commit of package [spacewalk-setup] release [1.6.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 426c5b4..2db4f77 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.6.1-1 spacewalk/setup/
+1.6.2-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index fe59086..7d76571 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.6.1
+Version: 1.6.2
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.2-1
+- 679335 - remove osa-dispatcher login credentials from rhn.conf
+
* Fri Oct 07 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.1-1
- 715271 - define AJP connector on [::1]:8009
commit dfa6212902e3efabfa18242570fcb2f035758275
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:25:43 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.6.38-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index aaf4dcf..2ca496c 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 and Python
-Version: 1.6.37
+Version: 1.6.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.38-1
+- 679335 - remove osa-dispatcher login credentials from rhn.conf
+
* Wed Nov 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.37-1
- support V4 RSA signatures
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 194ea46..ae51f36 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.37-1 backend/
+1.6.38-1 backend/
commit 3fce461f291cd3038a1e99dd9c32169ba38984ae
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:25:31 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.27-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 74f632e..43abb06 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.26-1 schema/spacewalk/
+1.6.27-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 6f75386..c48fa4b 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.6.26
+Version: 1.6.27
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.27-1
+- 679335 - store osa-dispatcher jabber password in DB
+
* Thu Nov 03 2011 Jan Pazdziora 1.6.26-1
- On PostgreSQL, use varchar instead of varchar2.
12 years, 7 months
2 commits - backend/common client/tools schema/spacewalk spacewalk/config spacewalk/setup
by Milan Zazrivec
backend/common/rhnConfig.py | 2
client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf | 2
client/tools/osad/src/osa_dispatcher.py | 39 +++++++---
schema/spacewalk/common/tables/rhnPushDispatcher.sql | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql | 3
spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 6 -
spacewalk/setup/bin/spacewalk-setup | 23 -----
8 files changed, 33 insertions(+), 44 deletions(-)
New commits:
commit a6cfc6bf776d731d7977d324fd40c3fe3c786234
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:23:08 2011 +0100
679335 - remove osa-dispatcher login credentials from rhn.conf
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index 2f05168..ef0870b 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -475,8 +475,6 @@ def parse_line(line):
"""
converTable = {'proxy.http_proxy_username': str,
'proxy.http_proxy_password': str,
- 'osa-dispatcher.jabber_username': str,
- 'osa-dispatcher.jabber_password': str,
'server.satellite.http_proxy_username': str,
'server.satellite.http_proxy_password': str,
'server.satellite.rhn_parent': str}
diff --git a/client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf b/client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf
index 7c38642..efeb311 100644
--- a/client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf
+++ b/client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf
@@ -4,7 +4,5 @@ log_file = /var/log/rhn/osa-dispatcher.log
osa_ssl_cert = /usr/share/rhn/RHNS-OSA-CERT
# Jabber server to connect to
jabber_server = jabberserver.example.org:5234
-jabber_username =
-jabber_password =
poll_interval = 5
diff --git a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
index 369d79d..7ccbd1d 100644
--- a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
+++ b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
@@ -76,12 +76,6 @@ osa-dispatcher.jabber_server = @@jabberDOThostname@@
# set up SSL on the dispatcher
osa-dispatcher.osa_ssl_cert = @@osadispatcherDOTosa_ssl_cert@@
-# set up a username and password for the dispatcher to connect to the
-# jabber network
-
-osa-dispatcher.jabber_username = @@osadispatcherDOTusername@@
-osa-dispatcher.jabber_password = @@osadispatcherDOTpassword@@
-
# Enable Solaris support
web.enable_solaris_support = @@webDOTenable_solaris_support@@
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 114817f..b35b58d 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1040,8 +1040,6 @@ sub populate_initial_configs {
hibernate_driver_proto => $hibernate_driver_proto,
traceback_mail => $answers->{'admin-email'},
jabberDOThostname => $answers->{hostname},
- osadispatcherDOTusername => 'rhn-dispatcher-sat',
- osadispatcherDOTpassword => 'rhn-dispatcher-' . random_password(6),
serverDOTsatelliteDOTca_chain => '/usr/share/rhn/RHNS-CA-CERT',
serverDOTnls_lang => 'english.' . $charset,
server_secret_key => generate_secret(),
@@ -1265,27 +1263,6 @@ sub random_bits {
return $rand_data;
}
-
-
-sub random_password {
- my $length = shift;
-
- die "random password too short\n"
- unless $length > 5;
-
- my $ret;
- my @chars = ('a'..'z');
- my @nums = ('0'..'9');
-
- $ret .= $chars[int rand @chars]
- while $length-- > 5;
-
- $ret .= $nums[int rand @nums]
- while $length-- >= 0;
-
- return $ret;
-}
-
sub setup_gpg {
my $opts = shift;
commit ef558160c3929d3052c68082e361366cd2171d97
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 4 17:22:43 2011 +0100
679335 - store osa-dispatcher jabber password in DB
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index ff9ceee..9f207af 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -16,7 +16,9 @@
import sys
import select
import socket
+import string
import SocketServer
+from random import choice
from rhn.connections import idn_ascii_to_pune
from spacewalk.common.rhnLog import initLOG, log_debug, log_error
from spacewalk.common.rhnConfig import initCFG, CFG
@@ -50,17 +52,30 @@ class Runner(jabber_lib.Runner):
self._state_ids = {}
def read_config(self):
- if not CFG.jabber_username:
- raise ValueError("Username not specified")
- if not CFG.jabber_password:
- raise ValueError("Password not specified")
ret = {
- 'username' : CFG.jabber_username,
- 'password' : CFG.jabber_password,
'jabber_server' : CFG.jabber_server,
}
return ret
+ _query_get_dispatcher_password = """
+ select password
+ from rhnPushDispatcher
+ where jabber_id like :jabber_id
+ """
+ def get_dispatcher_password(self, username):
+ h = rhnSQL.prepare(self._query_get_dispatcher_password)
+ h.execute(jabber_id = username + "%")
+ ret = h.fetchall_dict()
+
+ if ret and len(ret) == 1:
+ return ret[0]['password']
+ else:
+ return None
+
+ def create_dispatcher_password(self, length):
+ chars = string.ascii_letters + string.digits
+ return "".join(choice(chars) for x in range(length))
+
def setup_config(self, config):
# Figure out the log level
debug_level = self.options.verbose
@@ -81,8 +96,10 @@ class Runner(jabber_lib.Runner):
rhnSQL.initDB()
- self._username = config.get('username')
- self._password = config.get('password')
+ self._username = 'rhn-dispatcher-sat'
+ self._password = self.get_dispatcher_password(self._username)
+ if not self._password:
+ self._password = self.create_dispatcher_password(32)
self._resource = 'superclient'
js = config.get('jabber_server')
self._jabber_servers = [ idn_ascii_to_pune(js) ]
@@ -245,16 +262,16 @@ class Runner(jabber_lib.Runner):
if i is null then
-- Have to insert the row
insert into rhnPushDispatcher
- (id, jabber_id, last_checkin, hostname, port)
+ (id, jabber_id, last_checkin, hostname, port, password)
values (sequence_nextval('rhn_pushdispatch_id_seq'), :jabber_id_in, current_timestamp,
- :hostname_in, :port_in);
+ :hostname_in, :port_in, :password);
end if;
end;
""")
def _register_dispatcher(self, jabber_id, hostname, port):
h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar' ))
- h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port)
+ h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password=self._password)
rhnSQL.commit()
_query_get_client_jids = rhnSQL.Statement("""
diff --git a/schema/spacewalk/common/tables/rhnPushDispatcher.sql b/schema/spacewalk/common/tables/rhnPushDispatcher.sql
index ea938c9..e81dce6 100644
--- a/schema/spacewalk/common/tables/rhnPushDispatcher.sql
+++ b/schema/spacewalk/common/tables/rhnPushDispatcher.sql
@@ -20,6 +20,7 @@ CREATE TABLE rhnPushDispatcher
CONSTRAINT rhn_pushdispatch_id_pk PRIMARY KEY
USING INDEX TABLESPACE [[8m_tbs]],
jabber_id VARCHAR2(128) NOT NULL,
+ password VARCHAR(32),
last_checkin DATE
DEFAULT (sysdate) NOT NULL,
hostname VARCHAR2(256) NOT NULL,
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.oracle
new file mode 100644
index 0000000..6288345
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.oracle
@@ -0,0 +1 @@
+alter table rhnPushDispatcher add password varchar2(32);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql
new file mode 100644
index 0000000..c021cb6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 66bf4b1447a6fd90a219f5731196698edf7b3683
+
+alter table rhnPushDispatcher add password varchar2(32);
12 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.6.72-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.72-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-11-04 13:52 +0000
Tagging package [spacewalk-java] version [1.6.72-1] in directory [java/].
Changes since spacewalk-web-1.6.27-1:
Tomas Lestach (5):
593300 - handle directoriy and symlink config revision comparism
699505 - fix typo: *managable -> *mangeable in channel.software APIs and their doc
699505 - restrict manageable flag only for custom channels
723528 - fix template attribute type in kickstart.profile API documentation
Automatic commit of package [spacewalk-java] release [1.6.72-1].
---
java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java | 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 18 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 2 -
java/spacewalk-java.spec | 12 ++++++
rel-eng/packages/spacewalk-java | 2 -
5 files changed, 29 insertions(+), 10 deletions(-)
---
12 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit de39ed08180183da0e864910e7db067e2d517d59
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 4 14:52:00 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.72-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6016f78..bebf919 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.71
+Version: 1.6.72
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.72-1
+- 723528 - fix template attribute type in kickstart.profile API documentation
+ (tlestach(a)redhat.com)
+- 699505 - restrict manageable flag only for custom channels
+ (tlestach(a)redhat.com)
+- 699505 - fix typo: *managable -> *mangeable in channel.software APIs and
+ their doc (tlestach(a)redhat.com)
+- 593300 - handle directoriy and symlink config revision comparism
+ (tlestach(a)redhat.com)
+
* Thu Nov 03 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.71-1
- 725050 - fix activationkey.setDetails apidoc (tlestach(a)redhat.com)
- 723528 - fix kickstart.profile.listScripts apidoc (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bf9d3d5..95f2020 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.71-1 java/
+1.6.72-1 java/
12 years, 7 months
4 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java | 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 18 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 2 -
3 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 9225bc152dc401cbe551424f493938440eb18924
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 4 14:44:36 2011 +0100
723528 - fix template attribute type in kickstart.profile API documentation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
index 333b60f..d7aacbd 100755
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
@@ -39,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* shell.")
* #prop_desc("boolean", "chroot", "True if the script will be executed within the
* chroot environment.")
- * #prop_desc("string", "template", "True if templating using cobbler is enabled")
+ * #prop_desc("boolean", "template", "True if templating using cobbler is enabled")
* #struct_end()
*/
public class KickstartScriptSerializer implements XmlRpcCustomSerializer {
commit c98341ed96d1fdd81505b04f187f90357f09bdab
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 4 14:41:15 2011 +0100
699505 - restrict manageable flag only for custom channels
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 a69765d..773a807 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
@@ -1138,6 +1138,10 @@ public class ChannelSoftwareHandler extends BaseHandler {
User target = XmlRpcUserHelper.getInstance().lookupTargetUser(loggedInUser, login);
Channel channel = lookupChannelByLabel(loggedInUser, channelLabel);
+ if (!channel.isCustom()) {
+ throw new InvalidChannelException(
+ "Manageable flag is relevant for custom channels only.");
+ }
//Verify permissions
if (!(UserManager.verifyChannelAdmin(loggedInUser, channel) ||
loggedInUser.hasRole(RoleFactory.CHANNEL_ADMIN))) {
@@ -1214,6 +1218,10 @@ public class ChannelSoftwareHandler extends BaseHandler {
loggedInUser, login);
Channel channel = lookupChannelByLabel(loggedInUser.getOrg(), channelLabel);
+ if (!channel.isCustom()) {
+ throw new InvalidChannelException(
+ "Manageable flag is relevant for custom channels only.");
+ }
//Verify permissions
if (!(UserManager.verifyChannelAdmin(loggedInUser, channel) ||
loggedInUser.hasRole(RoleFactory.CHANNEL_ADMIN))) {
commit f399491eec9afbc0482ebe0f686816d4e7f02dcf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 4 14:30:04 2011 +0100
699505 - fix typo: *managable -> *mangeable in channel.software APIs and their doc
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 5aedd76..a69765d 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
@@ -1109,7 +1109,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
/**
- * Set the managable flag for a given channel and user. If value is set to 'true',
+ * Set the manageable flag for a given channel and user. If value is set to 'true',
* this method will give the user manage permissions to the channel. Otherwise, this
* method revokes that privilege.
* @param sessionKey The sessionKey containing the logged in user
@@ -1122,7 +1122,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
* - The loggedInUser doesn't have permission to perform this action
* - The login, sessionKey, or channelLabel is invalid
*
- * @xmlrpc.doc Set the managable flag for a given channel and user.
+ * @xmlrpc.doc Set the manageable flag for a given channel and user.
* If value is set to 'true', this method will give the user
* manage permissions to the channel. Otherwise, that privilege is revoked.
* @xmlrpc.param #session_key()
@@ -1131,7 +1131,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
* @xmlrpc.param #param_desc("boolean", "value", "value of the flag to set")
* @xmlrpc.returntype #return_int_success()
*/
- public int setUserManagable(String sessionKey, String channelLabel,
+ public int setUserManageable(String sessionKey, String channelLabel,
String login, Boolean value) throws FaultException {
// Get Logged in user
User loggedInUser = getLoggedInUser(sessionKey);
@@ -1204,9 +1204,9 @@ public class ChannelSoftwareHandler extends BaseHandler {
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "channelLabel", "label of the channel")
* @xmlrpc.param #param_desc("string", "login", "login of the target user")
- * @xmlrpc.returntype int - 1 if subscribable, 0 if not
+ * @xmlrpc.returntype int - 1 if manageable, 0 if not
*/
- public int isUserManagable(String sessionKey, String channelLabel,
+ public int isUserManageable(String sessionKey, String channelLabel,
String login) throws FaultException {
// Get Logged in user
User loggedInUser = getLoggedInUser(sessionKey);
commit 888603756256c5f374899bf085914ff768bb0642
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 4 13:53:31 2011 +0100
593300 - handle directoriy and symlink config revision comparism
(they do not have any content)
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java b/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
index 48faf5e..4c91230 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
@@ -203,8 +203,9 @@ public class ConfigRevision extends BaseDomainHelper {
*/
public boolean matches(ConfigRevision other) {
return configFile.equals(other.getConfigFile()) &&
- configContent.equals(other.getConfigContent()) &&
configFileType.equals(other.getConfigFileType()) &&
- configInfo.equals(other.getConfigInfo());
+ configInfo.equals(other.getConfigInfo()) &&
+ (configContent == null ? other.getConfigContent() == null :
+ configContent.equals(other.getConfigContent()));
}
}
12 years, 7 months
Changes to 'refs/tags/spacewalk-web-1.6.27-1'
by Michael Mraka
Tag 'spacewalk-web-1.6.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-11-04 12:19 +0000
Tagging package [spacewalk-web] version [1.6.27-1] in directory [web/].
Changes since spacewalk-schema-1.6.26-1:
Michael Mraka (2):
removed aliases from SET part of UPDATE
Automatic commit of package [spacewalk-web] release [1.6.27-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/TableClass.pm | 2 ++
web/spacewalk-web.spec | 5 ++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 7 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 54e0be948704762cf3167d8b233a4c841a5a0f57
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 4 13:19:28 2011 +0100
Automatic commit of package [spacewalk-web] release [1.6.27-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 550489c..dadc4b5 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.26-1 web/
+1.6.27-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 60441bc..f8f0477 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.26
+Version: 1.6.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Nov 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.27-1
+- removed aliases from SET part of UPDATE
+
* Wed Nov 02 2011 Jan Pazdziora 1.6.26-1
- Workaround for DBD::Pg bug https://rt.cpan.org/Ticket/Display.html?id=70953.
12 years, 7 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/TableClass.pm | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 48b6d1b1461612c5e22bb27f369336b607589a95
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 4 12:00:49 2011 +0100
removed aliases from SET part of UPDATE
fixing
Error message:
RHN::Exception: DBD::Pg::st execute failed: ERROR: column "sg" of
relation "rhnservergroup" does not exist LINE 2: SET SG.name = $1,
SG.description = $2
^
RHN::DB /usr/share/perl5/vendor_perl/RHN/DB.pm 228 RHN::Exception::DB::throw
RHN::DB::ServerGroup
/usr/share/perl5/vendor_perl/RHN/DB/ServerGroup.pm 114
RHN::DB::handle_error
Sniglets::ServerGroup
/usr/share/perl5/vendor_perl/Sniglets/ServerGroup.pm 340
RHN::DB::ServerGroup::commit
Sniglets::ServerGroup
/usr/share/perl5/vendor_perl/Sniglets/ServerGroup.pm 339 (eval)
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm
493 Sniglets::ServerGroup::admin_server_group_edit_cb
PXT::Request /usr/share/perl5/vendor_perl/PXT/Request.pm 584
PXT::ApacheHandler::pxt_parse_data
PXT::Handlers /usr/share/perl5/vendor_perl/PXT/Handlers.pm 115
PXT::Request::include
PXT::Parser /usr/share/perl5/vendor_perl/PXT/Parser.pm 141
PXT::Handlers::pxt_include_handler
PXT::Parser /usr/share/perl5/vendor_perl/PXT/Parser.pm 72
PXT::Parser::expand_tag
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm
467 PXT::Parser::expand_tags
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm
103 PXT::ApacheHandler::pxt_parse_data
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm
103 (eval)
main -e 0 PXT::ApacheHandler::handler
main -e 0 (eval)
diff --git a/web/modules/rhn/RHN/DB/TableClass.pm b/web/modules/rhn/RHN/DB/TableClass.pm
index bb627f7..fe8a7ce 100644
--- a/web/modules/rhn/RHN/DB/TableClass.pm
+++ b/web/modules/rhn/RHN/DB/TableClass.pm
@@ -130,9 +130,11 @@ sub update_query {
return '' unless grep { exists $changed_fields{$_} } $self->column_names;
+ my $remove_alias = "$self->{alias}.";
my $ret;
$ret .= "UPDATE $self->{name} $self->{alias}\nSET ";
$ret .= join(", ", map { "$_ = " . $self->type_to_placeholder($_) }
+ map { ($remove_alias eq substr($_, 0, length($remove_alias))) ? substr($_, length($remove_alias)) : $_ }
grep { exists $changed_fields{$_} } map { "$_" } $self->column_names);
$ret .= "\nWHERE ";
12 years, 7 months