paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 08:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Streams: Disallow certain markdown characters in stream names."

Browse Source 
This reverts commit dd1b14378b.

Deleted a conflicted test entirely.
This commit is contained in:
Greg Price
2017-12-19 16:07:36 -08:00
parent 44a0cd77cb
commit ca1129dea3
5 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/casper_tests/05-subscriptions.js
View File

@@ -140,16 +140,6 @@ casper.then(function () {
casper.click('form#stream_creation_form button.button.white'); casper.click('form#stream_creation_form button.button.white');
casper.fill('form#add_new_subscription', {stream_name: ' '}); casper.fill('form#add_new_subscription', {stream_name: ' '});
casper.click('#add_new_subscription .create_stream_button'); casper.click('#add_new_subscription .create_stream_button');
casper.fill('form#stream_creation_form', {stream_name: 'Waseemio@'});
casper.click('form#stream_creation_form button.button.sea-green');
});
});
casper.then(function () {
casper.waitForSelectorText('#stream_name_error', 'Stream names cannot contain #, *, `, or @.', function () {
casper.test.assertTextExists('Stream names cannot contain #, *, `, or @.', "Can't create a stream with invalid characters");
casper.click('form#stream_creation_form button.button.white');
casper.fill('form#add_new_subscription', {stream_name: ' '});
casper.click('#add_new_subscription .create_stream_button');
casper.fill('form#stream_creation_form', {stream_name: 'Waseemio'}); casper.fill('form#stream_creation_form', {stream_name: 'Waseemio'});
casper.click('form#stream_creation_form button.button.sea-green'); casper.click('form#stream_creation_form button.button.sea-green');
}); });

12
static/js/stream_create.js
View File

@@ -33,11 +33,6 @@ var stream_name_error = (function () {
$("#stream_name_error").show(); $("#stream_name_error").show();
}; };
self.report_invalid_chars = function () {
$("#stream_name_error").text(i18n.t("Stream names cannot contain #, *, `, or @."));
$("#stream_name_error").show();
};
self.select = function () { self.select = function () {
$("#create_stream_name").focus().select(); $("#create_stream_name").focus().select();
}; };
@@ -71,13 +66,6 @@ var stream_name_error = (function () {
return false; return false;
} }
// Keep characters in sync with Stream.NAME_INVALID_CHARS
if (/[#*`@]/.test(stream_name)) {
self.report_invalid_chars();
self.select();
return false;
}
// If we got this far, then we think we have a new unique stream // If we got this far, then we think we have a new unique stream
// name, so we'll submit to the server. (It's still plausible, // name, so we'll submit to the server. (It's still plausible,
// however, that there's some invite-only stream that we don't // however, that there's some invite-only stream that we don't

3
zerver/lib/actions.py
View File

@@ -1718,9 +1718,6 @@ def check_stream_name(stream_name: Text) -> None:
raise JsonableError(_("Invalid stream name '%s'" % (stream_name))) raise JsonableError(_("Invalid stream name '%s'" % (stream_name)))
if len(stream_name) > Stream.MAX_NAME_LENGTH: if len(stream_name) > Stream.MAX_NAME_LENGTH:
raise JsonableError(_("Stream name too long (limit: %s characters)." % (Stream.MAX_NAME_LENGTH))) raise JsonableError(_("Stream name too long (limit: %s characters)." % (Stream.MAX_NAME_LENGTH)))
if set(stream_name).intersection(Stream.NAME_INVALID_CHARS):
raise JsonableError(_("Invalid characters in stream name (disallowed characters: %s)."
% ((', ').join(Stream.NAME_INVALID_CHARS))))
for i in stream_name: for i in stream_name:
if ord(i) == 0: if ord(i) == 0:
raise JsonableError(_("Stream name '%s' contains NULL (0x00) characters." % (stream_name))) raise JsonableError(_("Stream name '%s' contains NULL (0x00) characters." % (stream_name)))

2
zerver/models.py
View File

@@ -862,8 +862,6 @@ def generate_email_token_for_stream() -> str:
class Stream(models.Model): class Stream(models.Model):
MAX_NAME_LENGTH = 60 MAX_NAME_LENGTH = 60
# Keep in sync with stream_create.js
NAME_INVALID_CHARS = ['*', '@', '`', '#']
name = models.CharField(max_length=MAX_NAME_LENGTH, db_index=True) # type: Text name = models.CharField(max_length=MAX_NAME_LENGTH, db_index=True) # type: Text
realm = models.ForeignKey(Realm, db_index=True, on_delete=CASCADE) # type: Realm realm = models.ForeignKey(Realm, db_index=True, on_delete=CASCADE) # type: Realm
invite_only = models.NullBooleanField(default=False) # type: Optional[bool] invite_only = models.NullBooleanField(default=False) # type: Optional[bool]

12
zerver/tests/test_subs.py
View File

@@ -1369,18 +1369,6 @@ class SubscriptionRestApiTest(ZulipTestCase):
self.assert_json_error(result, self.assert_json_error(result,
"Stream name too long (limit: 60 characters).") "Stream name too long (limit: 60 characters).")
def test_stream_name_has_invalid_characters(self) -> None:
email = self.example_email('hamlet')
self.login(email)
stream_name = "a*"
request = {
'delete': ujson.dumps([stream_name])
}
result = self.api_patch(email, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result,
"Invalid characters in stream name (disallowed characters: *, @, `, #).")
def test_stream_name_contains_null(self) -> None: def test_stream_name_contains_null(self) -> None:
email = self.example_email('hamlet') email = self.example_email('hamlet')
self.login(email) self.login(email)