Browse Source

Remove trailing spaces in text files, following .editorconfig (#573)

pull/576/head
Peter Dave Hello 4 years ago
committed by GitHub
parent
commit
7ce7be6451
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 16 deletions
  1. +2
    -2
      bin/build_web_extensions
  2. +2
    -2
      bin/build_web_site
  3. +1
    -1
      cli/tests/test_functional.py
  4. +1
    -1
      containers/backend/Dockerfile
  5. +1
    -1
      containers/ssl/create_ca_and_ee.sh
  6. +1
    -1
      containers/webserver/Dockerfile
  7. +3
    -3
      mobile/android/app/src/main/java/com/lesspass/android/Crypto.java
  8. +4
    -4
      mobile/ios/LessPassModule.swift
  9. +1
    -1
      packages/lesspass-site/Dockerfile

+ 2
- 2
bin/build_web_extensions View File

@@ -5,7 +5,7 @@ NOCOLOR='\033[0m'


function print_error { function print_error {
echo -e "${RED}$1${NOCOLOR}" echo -e "${RED}$1${NOCOLOR}"
}
}


function check_current_directory_is_root { function check_current_directory_is_root {
if [ ! -f README.md ]; then if [ ! -f README.md ]; then
@@ -83,7 +83,7 @@ function increment_version {
patch=$((patch + 1)) patch=$((patch + 1))
;; ;;
esac esac
new_version="$major.$minor.$patch" new_version="$major.$minor.$patch"
echo ${new_version} echo ${new_version}
} }


+ 2
- 2
bin/build_web_site View File

@@ -5,7 +5,7 @@ NOCOLOR='\033[0m'


function print_error { function print_error {
echo -e "${RED}$1${NOCOLOR}" echo -e "${RED}$1${NOCOLOR}"
}
}


function check_current_directory_is_root { function check_current_directory_is_root {
if [ ! -f README.md ]; then if [ ! -f README.md ]; then
@@ -83,7 +83,7 @@ function increment_version {
patch=$((patch + 1)) patch=$((patch + 1))
;; ;;
esac esac
new_version="$major.$minor.$patch" new_version="$major.$minor.$patch"
echo ${new_version} echo ${new_version}
} }


+ 1
- 1
cli/tests/test_functional.py View File

@@ -19,7 +19,7 @@ class TestFunctional(unittest.TestCase):


def test_length_range_type(self): def test_length_range_type(self):
self.assertEqual(range_type('5'), 5) self.assertEqual(range_type('5'), 5)
self.assertEqual(range_type('35'), 35)
self.assertEqual(range_type('35'), 35)
with self.assertRaises(argparse.ArgumentTypeError): with self.assertRaises(argparse.ArgumentTypeError):
range_type('2') range_type('2')




+ 1
- 1
containers/backend/Dockerfile View File

@@ -1,6 +1,6 @@
FROM python:3.6 FROM python:3.6
LABEL maintainer="LessPass <contact@lesspass.com>" LABEL maintainer="LessPass <contact@lesspass.com>"
LABEL name="LessPass Backend"
LABEL name="LessPass Backend"
RUN mkdir /opt/backend RUN mkdir /opt/backend
WORKDIR /opt/backend WORKDIR /opt/backend
COPY requirements.txt /opt/backend COPY requirements.txt /opt/backend


+ 1
- 1
containers/ssl/create_ca_and_ee.sh View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# This script will create a custom Certificate Authority (CA) and End Entity (EE) certificates. # This script will create a custom Certificate Authority (CA) and End Entity (EE) certificates.
#
#
# for local development this should be fine and you can ignore certificate trust errors related to # for local development this should be fine and you can ignore certificate trust errors related to
# an untrusted root. For public facing access, you can submit the generated lesspass.csr to a trusted # an untrusted root. For public facing access, you can submit the generated lesspass.csr to a trusted
# ca so that they can provide you with a trusted certificate to replace this development certificate. # ca so that they can provide you with a trusted certificate to replace this development certificate.


+ 1
- 1
containers/webserver/Dockerfile View File

@@ -1,6 +1,6 @@
FROM httpd:2.4 FROM httpd:2.4
LABEL maintainer="LessPass <contact@lesspass.com>" LABEL maintainer="LessPass <contact@lesspass.com>"
LABEL name="LessPass Web Server"
LABEL name="LessPass Web Server"


COPY ./httpd-default.conf /usr/local/apache2/conf/extra/httpd-default.conf COPY ./httpd-default.conf /usr/local/apache2/conf/extra/httpd-default.conf
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf


+ 3
- 3
mobile/android/app/src/main/java/com/lesspass/android/Crypto.java View File

@@ -15,9 +15,9 @@ public class Crypto {
byte[] secretData = secret.getBytes(); byte[] secretData = secret.getBytes();
byte[] saltData = salt.getBytes(); byte[] saltData = salt.getBytes();
gen.init(secretData, saltData, iterations); gen.init(secretData, saltData, iterations);
byte[] derivedKey = ((KeyParameter)gen.generateDerivedParameters(keyLength * 8)).getKey();
byte[] derivedKey = ((KeyParameter)gen.generateDerivedParameters(keyLength * 8)).getKey();
return toHex(derivedKey); return toHex(derivedKey);
}
}
catch (Exception e){ catch (Exception e){
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@@ -32,7 +32,7 @@ public class Crypto {
byte[] result = new byte[hmac.getMacSize()]; byte[] result = new byte[hmac.getMacSize()];
hmac.doFinal(result, 0); hmac.doFinal(result, 0);
return toHex(result); return toHex(result);
}
}
catch (Exception e){ catch (Exception e){
throw new RuntimeException(e); throw new RuntimeException(e);
} }


+ 4
- 4
mobile/ios/LessPassModule.swift View File

@@ -78,9 +78,9 @@ extension Data {
} }


func pbkdf2(hash: CCPBKDFAlgorithm, password: String, salt: String, keyByteCount: Int, rounds: Int) -> String? { func pbkdf2(hash: CCPBKDFAlgorithm, password: String, salt: String, keyByteCount: Int, rounds: Int) -> String? {
guard let passwordData = password.data(using: .utf8), let saltData = salt.data(using: .utf8) else { return nil } guard let passwordData = password.data(using: .utf8), let saltData = salt.data(using: .utf8) else { return nil }
var derivedKeyData = Data(repeating: 0, count: keyByteCount) var derivedKeyData = Data(repeating: 0, count: keyByteCount)
let derivedCount = derivedKeyData.count let derivedCount = derivedKeyData.count
let derivationStatus: Int32 = derivedKeyData.withUnsafeMutableBytes { derivedKeyBytes in let derivationStatus: Int32 = derivedKeyData.withUnsafeMutableBytes { derivedKeyBytes in
@@ -111,7 +111,7 @@ class LessPassModule: NSObject {
rejecter reject:RCTPromiseRejectBlock) -> Void { rejecter reject:RCTPromiseRejectBlock) -> Void {
resolve("".hmac(algorithm: HMACAlgorithm.SHA256, key: masterPassword)) resolve("".hmac(algorithm: HMACAlgorithm.SHA256, key: masterPassword))
} }
@objc(calcEntropy:withLogin:withMasterPassword:withCounter:resolver:rejecter:) @objc(calcEntropy:withLogin:withMasterPassword:withCounter:resolver:rejecter:)
func calcEntropy(_ site: String, func calcEntropy(_ site: String,
withLogin login: String, withLogin login: String,
@@ -123,7 +123,7 @@ class LessPassModule: NSObject {
let r = pbkdf2(hash: CCPBKDFAlgorithm(kCCPRFHmacAlgSHA256), password: masterPassword, salt: salt, keyByteCount: 32, rounds: 100000) let r = pbkdf2(hash: CCPBKDFAlgorithm(kCCPRFHmacAlgSHA256), password: masterPassword, salt: salt, keyByteCount: 32, rounds: 100000)
resolve(r) resolve(r)
} }
@objc @objc
static func requiresMainQueueSetup() -> Bool { static func requiresMainQueueSetup() -> Bool {
return false return false


+ 1
- 1
packages/lesspass-site/Dockerfile View File

@@ -1,6 +1,6 @@
FROM node:lts AS builder FROM node:lts AS builder
LABEL maintainer="LessPass <contact@lesspass.com>" LABEL maintainer="LessPass <contact@lesspass.com>"
LABEL name="LessPass Frontend"
LABEL name="LessPass Frontend"
WORKDIR /opt/frontend WORKDIR /opt/frontend
COPY package.json yarn.lock ./ COPY package.json yarn.lock ./
RUN yarn install RUN yarn install


Loading…
Cancel
Save