Feature/ws cli (#15)
* New command line tool for transfering files / still very beta. * add readme * use cli11 for argument parsing * json -> msgpack * stop using base64 and use binary which can be stored in message pack
This commit is contained in:
		
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							262de49c3c
						
					
				
				
					commit
					73d7280723
				
			| @@ -1,135 +0,0 @@ | ||||
| /* | ||||
|  base64.cpp and base64.h | ||||
|  | ||||
|  Copyright (C) 2004-2008 René Nyffenegger | ||||
|  | ||||
|  This source code is provided 'as-is', without any express or implied | ||||
|  warranty. In no event will the author be held liable for any damages | ||||
|  arising from the use of this software. | ||||
|  | ||||
|  Permission is granted to anyone to use this software for any purpose, | ||||
|  including commercial applications, and to alter it and redistribute it | ||||
|  freely, subject to the following restrictions: | ||||
|  | ||||
|  1. The origin of this source code must not be misrepresented; you must not | ||||
|  claim that you wrote the original source code. If you use this source code | ||||
|  in a product, an acknowledgment in the product documentation would be | ||||
|  appreciated but is not required. | ||||
|  | ||||
|  2. Altered source versions must be plainly marked as such, and must not be | ||||
|  misrepresented as being the original source code. | ||||
|  | ||||
|  3. This notice may not be removed or altered from any source distribution. | ||||
|  | ||||
|  René Nyffenegger rene.nyffenegger@adp-gmbh.ch | ||||
|  | ||||
|  */ | ||||
|  | ||||
| #include "IXBase64.h" | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     static const std::string base64_chars = | ||||
|     "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||||
|     "abcdefghijklmnopqrstuvwxyz" | ||||
|     "0123456789+/"; | ||||
|  | ||||
|     std::string base64_encode(const std::string& data, size_t len) | ||||
|     { | ||||
|         std::string ret; | ||||
|         int i = 0; | ||||
|         int j = 0; | ||||
|         unsigned char char_array_3[3]; | ||||
|         unsigned char char_array_4[4]; | ||||
|  | ||||
|         const char* bytes_to_encode = data.c_str(); | ||||
|  | ||||
|         while(len--) | ||||
|         { | ||||
|             char_array_3[i++] = *(bytes_to_encode++); | ||||
|             if(i == 3) | ||||
|             { | ||||
|                 char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; | ||||
|                 char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); | ||||
|                 char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); | ||||
|                 char_array_4[3] = char_array_3[2] & 0x3f; | ||||
|  | ||||
|                 for(i = 0; (i <4) ; i++) | ||||
|                     ret += base64_chars[char_array_4[i]]; | ||||
|  | ||||
|                 i = 0; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if(i) | ||||
|         { | ||||
|             for(j = i; j < 3; j++) | ||||
|                 char_array_3[j] = '\0'; | ||||
|  | ||||
|             char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; | ||||
|             char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); | ||||
|             char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); | ||||
|             char_array_4[3] = char_array_3[2] & 0x3f; | ||||
|  | ||||
|             for(j = 0; (j < i + 1); j++) | ||||
|                 ret += base64_chars[char_array_4[j]]; | ||||
|  | ||||
|             while((i++ < 3)) | ||||
|                 ret += '='; | ||||
|  | ||||
|         } | ||||
|  | ||||
|         return ret; | ||||
|     } | ||||
|  | ||||
|     static inline bool is_base64(unsigned char c) | ||||
|     { | ||||
|         return (isalnum(c) || (c == '+') || (c == '/')); | ||||
|     } | ||||
|  | ||||
|     std::string base64_decode(const std::string& encoded_string) | ||||
|     { | ||||
|         int in_len = (int)encoded_string.size(); | ||||
|         int i = 0; | ||||
|         int j = 0; | ||||
|         int in_ = 0; | ||||
|         unsigned char char_array_4[4], char_array_3[3]; | ||||
|         std::string ret; | ||||
|  | ||||
|         while(in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) | ||||
|         { | ||||
|             char_array_4[i++] = encoded_string[in_]; in_++; | ||||
|             if(i ==4) | ||||
|             { | ||||
|                 for(i = 0; i <4; i++) | ||||
|                     char_array_4[i] = base64_chars.find(char_array_4[i]); | ||||
|  | ||||
|                 char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4); | ||||
|                 char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2); | ||||
|                 char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3]; | ||||
|  | ||||
|                 for(i = 0; (i < 3); i++) | ||||
|                     ret += char_array_3[i]; | ||||
|  | ||||
|                 i = 0; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if(i) | ||||
|         { | ||||
|             for(j = i; j <4; j++) | ||||
|                 char_array_4[j] = 0; | ||||
|  | ||||
|             for(j = 0; j <4; j++) | ||||
|                 char_array_4[j] = base64_chars.find(char_array_4[j]); | ||||
|  | ||||
|             char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4); | ||||
|             char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2); | ||||
|             char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3]; | ||||
|  | ||||
|             for(j = 0; (j < i - 1); j++) ret += char_array_3[j]; | ||||
|         } | ||||
|  | ||||
|         return ret; | ||||
|     } | ||||
| } | ||||
| @@ -1,15 +0,0 @@ | ||||
| /* | ||||
|  *  base64.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include <string> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     std::string base64_encode(const std::string& data, size_t len); | ||||
|     std::string base64_decode(const std::string& encoded_string); | ||||
| } | ||||
| @@ -1,27 +0,0 @@ | ||||
| /* | ||||
|  *  IXHMac.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
| #include "IXHMac.h" | ||||
| #include "IXBase64.h" | ||||
|  | ||||
| #include <openssl/hmac.h> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     std::string hmac(const std::string& data, const std::string& key) | ||||
|     { | ||||
|         constexpr size_t hashSize = 16; | ||||
|         unsigned char hash[hashSize]; | ||||
|  | ||||
|         HMAC(EVP_md5(), | ||||
|              key.c_str(), (int) key.size(), | ||||
|              (unsigned char *) data.c_str(), (int) data.size(), | ||||
|              (unsigned char *) hash, nullptr); | ||||
|  | ||||
|         std::string hashString(reinterpret_cast<char*>(hash), hashSize); | ||||
|  | ||||
|         return base64_encode(hashString, (uint32_t) hashString.size()); | ||||
|     } | ||||
| } | ||||
| @@ -1,14 +0,0 @@ | ||||
| /* | ||||
|  *  IXHMac.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include <string> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     std::string hmac(const std::string& data, const std::string& key); | ||||
| } | ||||
| @@ -1,22 +0,0 @@ | ||||
| /* | ||||
|  *  IXHash.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
|  | ||||
| #include <string> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     uint64_t djb2Hash(const std::string& data) | ||||
|     { | ||||
|         uint64_t hashAddress = 5381; | ||||
|  | ||||
|         for (auto& c : data) | ||||
|         { | ||||
|             hashAddress = ((hashAddress << 5) + hashAddress) + c; | ||||
|         } | ||||
|  | ||||
|         return hashAddress; | ||||
|     } | ||||
| } | ||||
| @@ -1,15 +0,0 @@ | ||||
| /* | ||||
|  *  IXHash.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include <string> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     uint64_t djb2Hash(const std::string& data); | ||||
| } | ||||
|  | ||||
| @@ -1,75 +0,0 @@ | ||||
| /* | ||||
|  *  IXUuid.cpp | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2018 Machine Zone. All rights reserved. | ||||
|  */ | ||||
|  | ||||
| /** | ||||
|  * Generate a random uuid similar to the uuid python module | ||||
|  * | ||||
|  * >>> import uuid | ||||
|  * >>> uuid.uuid4().hex | ||||
|  * 'bec08155b37d4050a1f3c3fa0276bf12' | ||||
|  * | ||||
|  * Code adapted from https://github.com/r-lyeh-archived/sole | ||||
|  */ | ||||
|  | ||||
| #include "IXUuid.h" | ||||
|  | ||||
| #include <sstream> | ||||
| #include <string> | ||||
| #include <iomanip> | ||||
| #include <random> | ||||
|  | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|     class Uuid | ||||
|     { | ||||
|         public: | ||||
|             Uuid(); | ||||
|             std::string toString() const; | ||||
|  | ||||
|         private: | ||||
|             uint64_t _ab; | ||||
|             uint64_t _cd; | ||||
|     }; | ||||
|  | ||||
|     Uuid::Uuid() | ||||
|     { | ||||
|         static std::random_device rd; | ||||
|         static std::uniform_int_distribution<uint64_t> dist(0, (uint64_t)(~0)); | ||||
|  | ||||
|         _ab = dist(rd); | ||||
|         _cd = dist(rd); | ||||
|  | ||||
|         _ab = (_ab & 0xFFFFFFFFFFFF0FFFULL) | 0x0000000000004000ULL; | ||||
|         _cd = (_cd & 0x3FFFFFFFFFFFFFFFULL) | 0x8000000000000000ULL; | ||||
|     } | ||||
|  | ||||
|     std::string Uuid::toString() const | ||||
|     { | ||||
|         std::stringstream ss; | ||||
|         ss << std::hex << std::nouppercase << std::setfill('0'); | ||||
|  | ||||
|         uint32_t a = (_ab >> 32); | ||||
|         uint32_t b = (_ab & 0xFFFFFFFF); | ||||
|         uint32_t c = (_cd >> 32); | ||||
|         uint32_t d = (_cd & 0xFFFFFFFF); | ||||
|  | ||||
|         ss << std::setw(8) << (a); | ||||
|         ss << std::setw(4) << (b >> 16); | ||||
|         ss << std::setw(4) << (b & 0xFFFF); | ||||
|         ss << std::setw(4) << (c >> 16 ); | ||||
|         ss << std::setw(4) << (c & 0xFFFF); | ||||
|         ss << std::setw(8) << d; | ||||
|  | ||||
|         return ss.str(); | ||||
|     } | ||||
|  | ||||
|     std::string uuid4() | ||||
|     { | ||||
|         Uuid id; | ||||
|         return id.toString(); | ||||
|     } | ||||
| } | ||||
| @@ -1,17 +0,0 @@ | ||||
| /* | ||||
|  *  IXUuid.h | ||||
|  *  Author: Benjamin Sergeant | ||||
|  *  Copyright (c) 2017 Machine Zone. All rights reserved. | ||||
|  */ | ||||
| #pragma once | ||||
|  | ||||
| #include <string> | ||||
|  | ||||
| namespace ix | ||||
| { | ||||
|    /** | ||||
|     * Generate a random uuid | ||||
|     */ | ||||
|    std::string uuid4(); | ||||
|  | ||||
| } | ||||
		Reference in New Issue
	
	Block a user