backend/server/handlers/xmlrpc/registration.py | 6 -
backend/server/rhnUser.py | 63 --------------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 -
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 5 -
rel-eng/packages/rhn-client-tools | 2
5 files changed, 11 insertions(+), 70 deletions(-)
New commits:
commit 8b9ed181bb47d5ec69510f7d851863aa97a57387
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 2 13:04:11 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.18-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2539589..45b980d 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.8.17
+Version: 1.8.18
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Aug 02 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.18-1
+- registerUser is dead since b27c6ad4b90a6c4c3f970fc0f8faefae7c134c9c
+
* Mon Jul 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.17-1
- removed dead code
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 2aa6c7c..021e5d3 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.17-1 client/rhel/rhn-client-tools/
+1.8.18-1 client/rhel/rhn-client-tools/
commit ecd2c49b3a4a2315ac4a928e447713f6e456367d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 2 12:55:53 2012 +0200
calls have been removed from client side, mark them as obsoleted
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index 84dda3e..afe5511 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -100,16 +100,16 @@ class Registration(rhnHandler):
self.functions.append("new_system")
self.functions.append("new_system_user_pass")
## self.functions.append("new_system_activation_key")
- self.functions.append("new_user")
+ self.functions.append("new_user") # obsoleted
self.functions.append("privacy_statement")
self.functions.append("refresh_hw_profile")
self.functions.append("register_osad")
self.functions.append("register_osad_jid")
self.functions.append("register_product")
- self.functions.append("reserve_user")
+ self.functions.append("reserve_user") # obsoleted
self.functions.append("send_serial")
self.functions.append("upgrade_version")
- self.functions.append("update_contact_info")
+ self.functions.append("update_contact_info") # obsoleted
self.functions.append("update_packages")
self.functions.append("update_transactions")
self.functions.append("virt_notify")
commit 72171b33a450a2a059bf6b18c0eb57f49fe96d60
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 2 12:50:11 2012 +0200
unfortunatelly old clients can still call new_user
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 8434893..a031a67 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -454,66 +454,9 @@ def __new_user_db(username, password, email, org_id, org_password):
# Bad password
raise rhnFault(2)
- # From this point on, the password may be encrypted
- if encrypted_password:
- password = encrypt_password(password)
-
- is_real = 0
- # the password matches, do we need to create a new entry?
- if not data.has_key("id"):
- user = User(username, password)
- else: # we have to reload this entry into a User structure
- user = User(username, password)
- if not user.reload(data["id"]) == 0:
- # something horked during reloading entry from database
- # we can not really say that the entry does not exist...
- raise rhnFault(10)
- is_real = 1
-
- # now we have user reloaded, check for updated email
- if email:
-
- # don't update the user's email address in the satellite context...
- # we *must* in the live context, but user creation through rhn_register
- # is disallowed in the satellite context anyway...
- if not pre_existing_user:
- user.set_info("email", email)
-
- # XXX This should go away eventually
- if org_id and org_password: # check out this org
- h = rhnSQL.prepare("""
- select id, password from web_customer
- where id = :org_id
- """)
- h.execute(org_id=str(org_id))
- data = h.fetchone_dict()
- if not data: # wrong organization
- raise rhnFault(2, _("Invalid Organization Credentials"))
- # The org password is not encrypted, easy comparison
- if org_password.lower() != data["password"].lower():
- # Invalid org password
- raise rhnFault(2, _("Invalid Organization Credentials"))
- if is_real: # this is a real entry, don't clobber the org_id
- old_org_id = user.contact["org_id"]
- new_org_id = data["id"]
- if old_org_id != new_org_id:
- raise rhnFault(42,
- _("User `%s' not a member of organization %s") %
- (username, org_id))
- else: # new user, set its org
- user.set_org_id(data["id"])
-
- # force the save if this is a new entry
- ret = user.save()
- if not ret == 0:
- raise rhnFault(5)
- # check if we need to remove the reservation
- if not data.has_key("id"):
- # remove reservation
- h = rhnSQL.prepare("""
- delete from rhnUserReserved where login_uc = upper(:username)
- """)
- h.execute(username=username)
+ # creation of user was never supported in spacewalk but this call was mis-used
+ # to check username/password in the past
+ # so let's skip other checks and return now
return 0
commit f1761b827be6458d7be6b560313a172e5c36a5e4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 2 12:20:17 2012 +0200
registerUser is dead since b27c6ad4b90a6c4c3f970fc0f8faefae7c134c9c
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
index 64e6c38..7300904 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -243,11 +243,6 @@ def reserveUser(username, password):
return s.registration.reserve_user(username, password)
-def registerUser(username, password):
- s = rhnserver.RhnServer()
- s.registration.new_user(username, password)
-
-
class RegistrationResult:
def __init__(self, systemId, channels, failedChannels, systemSlots,
failedSystemSlots, universalActivationKey, rawDict=None):