Skip to content

Commit 8d47e61

Browse files
Revert "Fixed corrupted users imported after eaee3a8"
This reverts commit 2bcd74c. It was wrongly cherry-picked on the 1.3 branch, which predates the bug this commit was fixing.
1 parent 6bcdf71 commit 8d47e61

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Artem Iglikov (aka artikz) <artem.iglikov@gmail.com>
2525
Damien Leroy <damien.leroy@be-oi.be>
2626
Tubérculo Martínez <nlehmann@dcc.uchile.cl>
2727
Evgeny Martynov <evgeny@epochfail.com>
28-
Edoardo Morassutto <edoardo.morassutto@gmail.com>
28+
Edoardo Morassutto <gianluigi988@gmail.com>
2929
Kento Nikaido (aka snukent) <snukent@gmail.com>
3030
William Pettersson <william.pettersson@gmail.com>
3131
Ludwig Schmidt <ludwigschmidt2@gmail.com>

cmscontrib/loaders/italy_yaml.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# Copyright © 2014-2016 William Di Luigi <williamdiluigi@gmail.com>
1010
# Copyright © 2015 Luca Chiodini <luca@chiodini.org>
1111
# Copyright © 2016 Andrea Cracco <guilucand@gmail.com>
12-
# Copyright © 2018 Edoardo Morassutto <edoardo.morassutto@gmail.com>
1312
#
1413
# This program is free software: you can redistribute it and/or modify
1514
# it under the terms of the GNU Affero General Public License as
@@ -40,7 +39,6 @@
4039
from cms.db import Contest, User, Task, Statement, Attachment, \
4140
Team, SubmissionFormatElement, Dataset, Manager, Testcase
4241
from cms.grading.languagemanager import LANGUAGES, HEADER_EXTS
43-
from cmscommon.crypto import build_password
4442
from cmscommon.datetime import make_datetime
4543
from cmscontrib import touch
4644

@@ -211,8 +209,6 @@ def get_contest(self):
211209

212210
tasks = load(conf, None, ["tasks", "problemi"])
213211
participations = load(conf, None, ["users", "utenti"])
214-
for p in participations:
215-
p["password"] = build_password(p["password"])
216212

217213
# Import was successful
218214
os.remove(os.path.join(self.path, ".import_error_contest"))
@@ -249,7 +245,7 @@ def get_user(self):
249245
return None
250246

251247
load(conf, args, "username")
252-
load(conf, args, "password", conv=build_password)
248+
load(conf, args, "password")
253249

254250
load(conf, args, ["first_name", "nome"])
255251
load(conf, args, ["last_name", "cognome"])

cmscontrib/loaders/polygon.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Programming contest management system
55
# Copyright © 2014 Artem Iglikov <artem.iglikov@gmail.com>
66
# Copyright © 2014 Stefano Maggiolo <s.maggiolo@gmail.com>
7-
# Copyright © 2018 Edoardo Morassutto <edoardo.morassutto@gmail.com>
87
#
98
# This program is free software: you can redistribute it and/or modify
109
# it under the terms of the GNU Affero General Public License as
@@ -37,7 +36,6 @@
3736
from cms import config
3837
from cms.db import Contest, User, Task, Statement, \
3938
SubmissionFormatElement, Dataset, Manager, Testcase
40-
from cmscommon.crypto import build_password
4139
from cmscontrib import touch
4240

4341
from .base_loader import ContestLoader, TaskLoader, UserLoader
@@ -325,7 +323,7 @@ def get_user(self):
325323
logger.info("Loading parameters for user %s.", username)
326324
args = {}
327325
args['username'] = userdata[0]
328-
args['password'] = build_password(userdata[1])
326+
args['password'] = userdata[1]
329327
args['first_name'] = userdata[2]
330328
args['last_name'] = userdata[3]
331329
args['hidden'] = (len(userdata) > 4 and userdata[4] == '1')
@@ -450,7 +448,7 @@ def get_contest(self):
450448
user = user.split(';')
451449
participations.append({
452450
"username": user[0].strip(),
453-
"password": build_password(user[1].strip()),
451+
"password": user[1].strip(),
454452
"hidden": user[4].strip()
455453
# "ip" is not passed
456454
})

0 commit comments

Comments
 (0)