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

Fiqare secmotic rules #411

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fiqare secmotic rules #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e79647
Rule 2: Unused function parameters should be removed
fiqare-secmotic Dec 16, 2019
85f7388
Rule 4: if.. else if constructs should end with else clauses
fiqare-secmotic Dec 16, 2019
da9359c
Update lib/iotaUtils.js
fiqare-secmotic Jan 9, 2020
a2e11f6
fiqare secmotic rules imporved
fiqare-secmotic Jan 20, 2020
46f6126
change branch master to fiqare-secmotic-rules for travis
fiqare-secmotic Jan 20, 2020
2e0a51d
updated to previous version
fiqare-secmotic Jan 20, 2020
662a458
JavaDoc entry removed
fiqare-secmotic Jan 20, 2020
9dfbdcb
Variable reset "results" and function "debug()" improved
fiqare-secmotic Jan 21, 2020
484e833
new entry for CHANGES_NEXT_RELEASE
fiqare-secmotic Jan 21, 2020
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
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
- Add: check response obj before use it handling http commands
- Upgrade NodeJS version from 8.16.1 to 10.17.0 in Dockerfile due to Node 8 End-of-Life
- Hardening: software quality improvement based on ISO25010 recommendations
2 changes: 2 additions & 0 deletions lib/bindings/HTTPBindings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ function handleError(error, req, res, next) {
name: error.name,
Copy link
Member

@fgalan fgalan Jan 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I think the PR is almost ready (good work! :). However, you should include an entry in the CHANGES_NEXT_RELEASE file in describing the changes. Maybe something like the following:

- Hardening: software quality improvement based on ISO25010 recommendations

Copy link
Author

Choose a reason for hiding this comment

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

fixed in 484e833

message: error.message
});
next();
}

function parseData(req, res, next) {
Expand Down Expand Up @@ -203,6 +204,7 @@ function returnCommands(req, res, next) {
} else {
res.status(200).send('');
}
next();
}

function handleIncomingMeasure(req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion lib/bindings/MQTTBinding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function start(callback) {
}
});
mqttClient.on('message', commonBindings.mqttMessageHandler);
mqttClient.on('connect', function(ack) {
mqttClient.on('connect', function() {
config.getLogger().info(context, 'MQTT Client connected');
recreateSubscriptions();
});
Expand Down
3 changes: 1 addition & 2 deletions lib/commonBindings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ function manageConfigurationRequest(apiKey, deviceId, device, objMessage) {
* @param {String} apikey APIKey of the service the device belongs to.
* @param {Array} previous Array of prepared functions that send information to the Context Broker.
* @param {Object} current Information sent by the device.
* @param {Number} index Index of the group in the array.
* @return {Array} Updated array of functions.
*/
function processMeasureGroup(device, apikey, previous, current, index) {
function processMeasureGroup(device, apikey, previous, current) {
Copy link
Member

Choose a reason for hiding this comment

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

JavaDoc entry for index (L115) should be removed also.

Copy link
Author

Choose a reason for hiding this comment

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

fixed in 662a458

var values = [];

if (current.command) {
Expand Down
4 changes: 4 additions & 0 deletions lib/iotaUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ function mergeDeviceWithConfiguration(deviceData, configuration, callback) {
deviceData[fields[i]] = configuration[confField];
} else if (!deviceData[fields[i]] && (!configuration || !configuration[confField])) {
deviceData[fields[i]] = defaults[i];
} else {
config
.getLogger()
.debug(context, 'at field "' + fields[i] + '" configuration merging logic did not merge anything');
}

if (deviceData[fields[i]] && ['active', 'lazy', 'commands'].indexOf(fields[i]) >= 0) {
Expand Down