verify action IDs #519

patriciojofre · 2021-10-14T13:48:55Z

Major modifications on storage logic for commands, files, geofencing, triggers, etc.

patriciojofre

delete all console.logs.
test behavior of verify_if_exist_id function. this function is the core of this PR.
maybe rename storage2 to more descriptive name

lib/agent/actions.js

sebapintoag · 2021-11-11T18:39:46Z

lib/agent/actions.js

@@ -39,6 +39,7 @@ var action_running = function(type, action, name, opts, emitter) {
  watch_action_events(action.events, emitter);
 }

+// revisar q hace esta funcion!


Es necesario que quede ese comentario?

sebapintoag · 2021-11-11T18:40:13Z

lib/agent/actions.js


-  emitter.once('end', function(err, out) {
+  emitter.once('end', function(id, err, out) {
    if (err) hooks.trigger('error', err);

    logger.info('Stopped: ' + name);


Suggested change

logger.info('Stopped: ' + name);

logger.info(`Stopped: ${name}`);

lib/agent/actions.js

sebapintoag · 2021-11-11T18:52:13Z

test/lib/agent/actions/fixtures/triggers_responses.js

@@ -65,7 +66,8 @@ var exact_triggers = [
      {
        "type": "exact_time",
        "info": {
-          "date": "" + (new Date().getFullYear() +1) + "0725150007"
+          "date": "20301015183411"
+          // "date": "" + (new Date().getFullYear() +1) + "0725150007"


Suggested change

// "date": "" + (new Date().getFullYear() +1) + "0725150007"

test/lib/agent/actions/triggers.js

sebapintoag · 2021-11-11T18:53:00Z

test/lib/agent/actions/triggers.js

+            // timezone_offset = new Date().getTimezoneOffset() * 60 * 1000,
+            // new_date = new Date(Date.UTC(2019, 11, 20, 11, 55, 05)).getTime() + timezone_offset;
+            // console.log("NEW DATE!!", new_date)
+            // new_date = 1574261705000;


Suggested change

// timezone_offset = new Date().getTimezoneOffset() * 60 * 1000,

// new_date = new Date(Date.UTC(2019, 11, 20, 11, 55, 05)).getTime() + timezone_offset;

// console.log("NEW DATE!!", new_date)

// new_date = 1574261705000;

test/lib/agent/actions/triggers.js

test/lib/agent/updating_spec.js

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

…into unique-id

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

jll90

Deje comentarios pero thumbs up!

lib/agent/actions.js

jll90 · 2021-11-11T19:06:59Z

lib/agent/actions/fileretrieval/index.js

@@ -36,6 +37,33 @@ var path_arg,
 // check_pending_files is used to resume any files that might been pending. It's called from
 // filesagent/providers/network.

+var run_stored = (host, cb) => {


Seria bueno por temas de estandares pasar todas las variables que estan en snake_case a camelCase. Entiendo que es algo que se puede ir haciendo poco a poco.

jll90 · 2021-11-11T19:07:48Z

lib/agent/actions/fileretrieval/index.js

@@ -88,25 +120,44 @@ exports.start = function(options, cb) {
      return;
    }
    if (res.statusCode == 404) {
-      files.del(options.file_id);
+      logger.debug('Removing file_id from DB: ' + options.file_id);
+      storage.do('del', { type: 'files', id: options.file_id });
      return;
    }
    var data = JSON.parse(res.body);
    var file_status = JSON.parse(res.body).Status
    options.total = data.Total;

    if (file_status == 0 || file_status == 4) { // File in progress(0) or Pending(4)  


Es preferible usar el === en JS, pero hay que tener cuidado si se hace este cambio.

lib/agent/actions/triggers/index.js

patriciojofre

coincido con @sebapintoag @jll90 en:

manejo de try / catch: utilizar la variable e para enviar la excepción a algun lado y saber qu está ocurriendo un error (bugsnag/exceptions)
comentarios en inglés o español
snakeCase en lo posible (o para este PR, pero para el siguiente sería ideal)

lib/agent/commands.js

javo · 2021-11-03T11:47:52Z

lib/agent/actions/fileretrieval/upload.js

@@ -37,7 +37,6 @@ function main() {
  }
  Main(options, function(err) {
    if (err) {
-      console.error(err);


tb regresalo

javo · 2021-11-03T11:48:12Z

lib/agent/actions/fileretrieval/upload.js

@@ -89,7 +88,6 @@ function upload_file(file, buf, cb) {

  needle.post(url, buf, options, function(err, res) {
    if (err) {
-      console.log(err);


javo · 2021-11-03T11:48:29Z

lib/agent/actions/wipe/runner.js

@@ -23,7 +23,6 @@ wipe.fetch_dirs(what, to_erase, to_kill, null, (err) => {
  if (err) last_err = err;
  wipe.wipeout((err, out) => {
    if (err) last_err = err;
-    console.log(out)


este tb es necesario

Javier Acuna and others added 7 commits August 13, 2021 10:52

Websockets on Node Client

e241673

Merge branch 'master' into websockets-node

4ba7c67

validate same id dont run

99947f6

actions run once

b9b84d9

stopped action with id

aef6950

Add id to some actions

21eed02

restore websocket files

9dc15b3

patriciojofre commented Oct 14, 2021

View reviewed changes

JohaoRosasRosillo and others added 22 commits October 14, 2021 09:53

delete comments and console

8cbe997

test verify unique id

bcf2cb2

Fixing triggers specs

1860817

Keep same actions behavior by name

42900a3

Logretrieval with id

f1c976e

geofencing test

619e5b5

Fix commands storage tests

6d4287a

Recover old db fixes

a839945

test geofencing

23a1685

Test for commands recovery

7ecc216

save files in new database

d214fc6

delete row file in db when finish upload

bc06925

test diskencryption

b8d208e

lock test with id

484e34d

test logretrieval

3ef849b

wipe test with id

6657998

test actions

613ba37

report missed fix

67d2390

fix test check server

a2ed355

fix report cancel

308b33f

comment storage old in commands

5b39bbe

test secure

4862ff6

Javier Acuna and others added 5 commits November 10, 2021 12:55

Fileretrieval fixes and storage rename

8d81ed4

delete console test diskencryption

87e3887

hostname fix storage

4c56116

File retrieval fixes, triggers and long polling tests fix

ae3b734

Little fixes

78f05ea

sebapintoag reviewed Nov 11, 2021

View reviewed changes

lib/agent/actions.js Outdated Show resolved Hide resolved

sebapintoag suggested changes Nov 11, 2021

View reviewed changes

JohaoRosasRosillo and others added 14 commits November 11, 2021 14:05

Update lib/agent/actions.js

fb9bf68

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions.js

8c49c2d

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions.js

b645fd8

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update test/lib/agent/updating_spec.js

9d46d35

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions/lock/index.js

b3eda51

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions/lock/index.js

478f145

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions/logretrieval/index.js

5f58852

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/actions/triggers/index.js

bbae64a

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update lib/agent/commands.js

a80b98e

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Remove comments

82bf909

Merge branch 'unique-id' of https://github.com/prey/prey-node-client …

335aa30

…into unique-id

Update test/lib/agent/actions.js

3dd8211

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update test/lib/agent/actions/triggers.js

93bbce7

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

Update test/lib/agent/actions/triggers.js

18cc28e

Co-authored-by: Seba Pinto-Agüero González <[email protected]>

jll90 approved these changes Nov 11, 2021

View reviewed changes

patriciojofre commented Nov 11, 2021

View reviewed changes

lib/agent/actions/triggers/index.js Show resolved Hide resolved

test comment for updating_spec and triggers

4672afc

patriciojofre commented Nov 11, 2021

View reviewed changes

lib/agent/commands.js Outdated Show resolved Hide resolved

JohaoRosasRosillo and others added 3 commits November 11, 2021 16:19

show error message in commands perform

d9183fb

show error in sync triggers

a5e5fc7

Fix exception errors

06608aa

javo approved these changes Nov 12, 2021

View reviewed changes

javo merged commit 8b4b087 into master Nov 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

verify action IDs #519

verify action IDs #519

patriciojofre commented Oct 14, 2021 •

edited by javo

Loading

patriciojofre left a comment

sebapintoag Nov 11, 2021

sebapintoag Nov 11, 2021

sebapintoag Nov 11, 2021

sebapintoag Nov 11, 2021

jll90 left a comment

jll90 Nov 11, 2021

jll90 Nov 11, 2021

patriciojofre left a comment

javo Nov 3, 2021

javo Nov 3, 2021

javo Nov 3, 2021

	logger.info('Stopped: ' + name);
	logger.info(`Stopped: ${name}`);

verify action IDs #519

verify action IDs #519

Conversation

patriciojofre commented Oct 14, 2021 • edited by javo Loading

patriciojofre left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jll90 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patriciojofre left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patriciojofre commented Oct 14, 2021 •

edited by javo

Loading