You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/06/15 11:52:42 UTC
nifi git commit: NIFI-5209 Removed unused test resources. Removed RAT
exclusion from pom.xml.
Repository: nifi
Updated Branches:
refs/heads/master 375239894 -> 90b8e7f9f
NIFI-5209 Removed unused test resources.
Removed RAT exclusion from pom.xml.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2798.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/90b8e7f9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/90b8e7f9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/90b8e7f9
Branch: refs/heads/master
Commit: 90b8e7f9ff8f8674ec7747c58b547c8499eb4574
Parents: 3752398
Author: Andy LoPresto <al...@apache.org>
Authored: Thu Jun 14 21:54:37 2018 -0700
Committer: Pierre Villard <pi...@gmail.com>
Committed: Fri Jun 15 13:52:33 2018 +0200
----------------------------------------------------------------------
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 12 ------------
.../src/test/resources/scrypt.py | 18 ------------------
.../src/test/resources/secure_hash.key | 2 --
.../src/test/resources/secure_hash_128.key | 2 --
4 files changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/90b8e7f9/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
index 8815d5e..8acf23a 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
@@ -163,18 +163,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/test/resources/scrypt.py</exclude>
- <!-- use wildcard for below files as tests generate additional files during the build -->
- <exclude>**/secure_hash.key</exclude>
- <exclude>**/secure_hash_128.key</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/nifi/blob/90b8e7f9/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/scrypt.py
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/scrypt.py b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/scrypt.py
deleted file mode 100644
index 97ba86f..0000000
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/scrypt.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/env python
-
-import base64
-from passlib.hash import scrypt
-
-
-def secure_hash(password, base64_encoded_salt):
- hash = scrypt.using(salt=base64.b64decode(base64_encoded_salt), rounds=4, block_size=8, parallelism=1).hash(password)
- return hash
-
-
-passwords=["password", "thisIsABadPassword", "bWZerzZo6fw9ZrDz*YfM6CVj2Ktx(YJd"]
-salts=["AAAAAAAAAAAAAAAAAAAAAA==", "ABCDEFGHIJKLMNOPQRSTUV==", "eO+UUcKYL2gnpD51QCc+gnywQ7Eg9tZeLMlf0XXr2zc="]
-
-for pw in passwords:
- for s in salts:
- print('Hashed "{}" with salt "{}": \t{}'.format(pw, s, secure_hash(pw, s)))
-
http://git-wip-us.apache.org/repos/asf/nifi/blob/90b8e7f9/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash.key
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash.key b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash.key
deleted file mode 100644
index ef7097e..0000000
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash.key
+++ /dev/null
@@ -1,2 +0,0 @@
-secureHashKey=$s0$40801$AAAAAAAAAAAAAAAAAAAAAA$pJOGA9sPL+pRzynnwt6G2FfVTyLQdbKSbk6W8IKId8E
-secureHashPassword=$s0$40801$AAAAAAAAAAAAAAAAAAAAAA$gLSh7ChbHdOIMvZ74XGjV6qF65d9qvQ8n75FeGnM8YM
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/90b8e7f9/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash_128.key
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash_128.key b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash_128.key
deleted file mode 100644
index ef7097e..0000000
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/secure_hash_128.key
+++ /dev/null
@@ -1,2 +0,0 @@
-secureHashKey=$s0$40801$AAAAAAAAAAAAAAAAAAAAAA$pJOGA9sPL+pRzynnwt6G2FfVTyLQdbKSbk6W8IKId8E
-secureHashPassword=$s0$40801$AAAAAAAAAAAAAAAAAAAAAA$gLSh7ChbHdOIMvZ74XGjV6qF65d9qvQ8n75FeGnM8YM
\ No newline at end of file