Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kafka topics should not contain special characters #492

Merged
merged 10 commits into from
Oct 26, 2016
Merged

Kafka topics should not contain special characters #492

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cacdbd4
Kafka topics should not contain special characters
shaikh-shahid Oct 24, 2016
e1fe46c
Update client.js
shaikh-shahid Oct 24, 2016
bcdc3ef
Update client.js
shaikh-shahid Oct 24, 2016
33028c1
Update client.js
shaikh-shahid Oct 24, 2016
18151c5
Validating the topics using util function
shaikh-shahid Oct 25, 2016
76b8524
Build fix
shaikh-shahid Oct 25, 2016
5adc88c
Update client.js
shaikh-shahid Oct 25, 2016
aed8069
Handling async nature of validation.
shaikh-shahid Oct 26, 2016
357bb21
Update client.js
shaikh-shahid Oct 26, 2016
696bb5a
Update client.js
shaikh-shahid Oct 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,25 @@ Client.prototype.loadMetadataForTopics = function (topics, cb) {
};

Client.prototype.createTopics = function (topics, isAsync, cb) {
function isValid (str) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could use validateConfig in lib/utils.js?. And it's might be easier to just check for legal characters than invalid ones. Check out the validation used in Topic.scala

Bonus points for:

  • Check length
  • Add topic validation to Consumer, HighLevelConsumer, and ConsumerGroup

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Make sense.

return !/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g.test(str);
}
topics = typeof topics === 'string' ? [topics] : topics;

if (typeof isAsync === 'function' && typeof cb === 'undefined') {
cb = isAsync;
isAsync = true;
}
var validTopics = true;
Object.keys(topics).map(function (elem) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Array.some could be used here and may not need to iterate through the entire list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one (Y)

if (!isValid(topics[elem])) {
validTopics = false;
}
});

if (!validTopics) {
return cb(null, 'Some topics contains special characters, please remove them');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets continue with the error first style and call the callback with a new Error as the first argument.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool.

}
var self = this;

// first, load metadata to create topics
Expand Down