Started moving from WireGuard for Windows to embeddable-dll-service
This commit is contained in:
parent
27be80e430
commit
8c484f9c23
@ -1,2 +1,5 @@
|
|||||||
# TVPN
|
# TVPN
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
- Blur private keys
|
||||||
|
- Auto compute public keys
|
@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = 'tech.nevets'
|
group = 'tech.nevets'
|
||||||
version = '0.1.0'
|
version = '0.2.0'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
BIN
libs/libwireguard_wrapper.dll
Normal file
BIN
libs/libwireguard_wrapper.dll
Normal file
Binary file not shown.
BIN
libs/tunnel.dll
Normal file
BIN
libs/tunnel.dll
Normal file
Binary file not shown.
BIN
libs/wireguard.dll
Normal file
BIN
libs/wireguard.dll
Normal file
Binary file not shown.
8
src/main/cpp/.idea/.gitignore
vendored
Normal file
8
src/main/cpp/.idea/.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
|
# Datasource local storage ignored files
|
||||||
|
/dataSources/
|
||||||
|
/dataSources.local.xml
|
1
src/main/cpp/.idea/.name
Normal file
1
src/main/cpp/.idea/.name
Normal file
@ -0,0 +1 @@
|
|||||||
|
WireGuardJNI
|
2
src/main/cpp/.idea/cpp.iml
Normal file
2
src/main/cpp/.idea/cpp.iml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module classpath="CMake" type="CPP_MODULE" version="4" />
|
4
src/main/cpp/.idea/misc.xml
Normal file
4
src/main/cpp/.idea/misc.xml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
|
||||||
|
</project>
|
8
src/main/cpp/.idea/modules.xml
Normal file
8
src/main/cpp/.idea/modules.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/cpp.iml" filepath="$PROJECT_DIR$/.idea/cpp.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
6
src/main/cpp/.idea/vcs.xml
Normal file
6
src/main/cpp/.idea/vcs.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
24
src/main/cpp/CMakeLists.txt
Normal file
24
src/main/cpp/CMakeLists.txt
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
project(WireGuardJNI)
|
||||||
|
|
||||||
|
# Set the C standard and C++ standard (optional if needed)
|
||||||
|
set(CMAKE_C_STANDARD 99)
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
|
# Specify where the JDK is located
|
||||||
|
set(JAVA_HOME "C:/Program Files/Java/openjdk-21")
|
||||||
|
set(JNI_INCLUDE_DIR "${JAVA_HOME}/include")
|
||||||
|
set(JNI_INCLUDE_DIR2 "${JAVA_HOME}/include/win32")
|
||||||
|
|
||||||
|
|
||||||
|
# Include the JNI header files
|
||||||
|
include_directories(${JNI_INCLUDE_DIR} ${JNI_INCLUDE_DIR2})
|
||||||
|
|
||||||
|
# Add the source file that includes your JNI C wrapper code
|
||||||
|
add_library(wireguard_wrapper SHARED wireguard_wrapper.c)
|
||||||
|
|
||||||
|
# Optionally, you can specify output directory for the compiled library
|
||||||
|
set_target_properties(wireguard_wrapper PROPERTIES
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY build/lib
|
||||||
|
OUTPUT_NAME "wireguard_wrapper"
|
||||||
|
)
|
117
src/main/cpp/tech_nevets_tvpn_wg_WireGuardJNI.h
Normal file
117
src/main/cpp/tech_nevets_tvpn_wg_WireGuardJNI.h
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
/* DO NOT EDIT THIS FILE - it is machine generated */
|
||||||
|
#include <jni.h>
|
||||||
|
/* Header for class tech_nevets_tvpn_wg_WireGuardJNI */
|
||||||
|
|
||||||
|
#ifndef _Included_tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
#define _Included_tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: installAdapter
|
||||||
|
* Signature: ()I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_installAdapter
|
||||||
|
(JNIEnv *, jobject);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: removeAdapter
|
||||||
|
* Signature: ()I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_removeAdapter
|
||||||
|
(JNIEnv *, jobject);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: startTunnel
|
||||||
|
* Signature: (Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_startTunnel
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: stopTunnel
|
||||||
|
* Signature: (Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_stopTunnel
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: createTunnel
|
||||||
|
* Signature: (Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_createTunnel
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: deleteTunnel
|
||||||
|
* Signature: (Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_deleteTunnel
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: getConfig
|
||||||
|
* Signature: (Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
*/
|
||||||
|
JNIEXPORT jstring JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_getConfig
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: updateConfig
|
||||||
|
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_updateConfig
|
||||||
|
(JNIEnv *, jobject, jstring, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: addConfig
|
||||||
|
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_addConfig
|
||||||
|
(JNIEnv *, jobject, jstring, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: getActiveTunnel
|
||||||
|
* Signature: ()Ljava/lang/String;
|
||||||
|
*/
|
||||||
|
JNIEXPORT jstring JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_getActiveTunnel
|
||||||
|
(JNIEnv *, jobject);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: isActive
|
||||||
|
* Signature: ()Z
|
||||||
|
*/
|
||||||
|
JNIEXPORT jboolean JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_isActive
|
||||||
|
(JNIEnv *, jobject);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: initializeWireGuard
|
||||||
|
* Signature: (Ljava/lang/String;)I
|
||||||
|
*/
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_initializeWireGuard
|
||||||
|
(JNIEnv *, jobject, jstring);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: tech_nevets_tvpn_wg_WireGuardJNI
|
||||||
|
* Method: cleanup
|
||||||
|
* Signature: ()V
|
||||||
|
*/
|
||||||
|
JNIEXPORT void JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_cleanup
|
||||||
|
(JNIEnv *, jobject);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
308
src/main/cpp/wireguard.h
Normal file
308
src/main/cpp/wireguard.h
Normal file
@ -0,0 +1,308 @@
|
|||||||
|
/* SPDX-License-Identifier: GPL-2.0 OR MIT
|
||||||
|
*
|
||||||
|
* Copyright (C) 2018-2021 WireGuard LLC. All Rights Reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <windows.h>
|
||||||
|
#include <ipexport.h>
|
||||||
|
#include <ifdef.h>
|
||||||
|
#include <ws2ipdef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ALIGNED
|
||||||
|
# if defined(_MSC_VER)
|
||||||
|
# define ALIGNED(n) __declspec(align(n))
|
||||||
|
# elif defined(__GNUC__)
|
||||||
|
# define ALIGNED(n) __attribute__((aligned(n)))
|
||||||
|
# else
|
||||||
|
# error "Unable to define ALIGNED"
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* MinGW is missing this one, unfortunately. */
|
||||||
|
#ifndef _Post_maybenull_
|
||||||
|
# define _Post_maybenull_
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 4324) /* structure was padded due to alignment specifier */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A handle representing WireGuard adapter
|
||||||
|
*/
|
||||||
|
typedef struct _WIREGUARD_ADAPTER *WIREGUARD_ADAPTER_HANDLE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new WireGuard adapter.
|
||||||
|
*
|
||||||
|
* @param Name The requested name of the adapter. Zero-terminated string of up to MAX_ADAPTER_NAME-1
|
||||||
|
* characters.
|
||||||
|
*
|
||||||
|
* @param TunnelType Name of the adapter tunnel type. Zero-terminated string of up to MAX_ADAPTER_NAME-1
|
||||||
|
* characters.
|
||||||
|
*
|
||||||
|
* @param RequestedGUID The GUID of the created network adapter, which then influences NLA generation deterministically.
|
||||||
|
* If it is set to NULL, the GUID is chosen by the system at random, and hence a new NLA entry is
|
||||||
|
* created for each new adapter. It is called "requested" GUID because the API it uses is
|
||||||
|
* completely undocumented, and so there could be minor interesting complications with its usage.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is the adapter handle. Must be released with
|
||||||
|
* WireGuardCloseAdapter. If the function fails, the return value is NULL. To get extended error information, call
|
||||||
|
* GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Must_inspect_result_
|
||||||
|
_Return_type_success_(return != NULL)
|
||||||
|
_Post_maybenull_
|
||||||
|
WIREGUARD_ADAPTER_HANDLE(WINAPI WIREGUARD_CREATE_ADAPTER_FUNC)
|
||||||
|
(_In_z_ LPCWSTR Name, _In_z_ LPCWSTR TunnelType, _In_opt_ const GUID *RequestedGUID);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Opens an existing WireGuard adapter.
|
||||||
|
*
|
||||||
|
* @param Name The requested name of the adapter. Zero-terminated string of up to MAX_ADAPTER_NAME-1
|
||||||
|
* characters.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is the adapter handle. Must be released with
|
||||||
|
* WireGuardCloseAdapter. If the function fails, the return value is NULL. To get extended error information, call
|
||||||
|
* GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Must_inspect_result_
|
||||||
|
_Return_type_success_(return != NULL)
|
||||||
|
_Post_maybenull_
|
||||||
|
WIREGUARD_ADAPTER_HANDLE(WINAPI WIREGUARD_OPEN_ADAPTER_FUNC)(_In_z_ LPCWSTR Name);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Releases WireGuard adapter resources and, if adapter was created with WireGuardCreateAdapter, removes adapter.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter.
|
||||||
|
*/
|
||||||
|
typedef VOID(WINAPI WIREGUARD_CLOSE_ADAPTER_FUNC)(_In_opt_ WIREGUARD_ADAPTER_HANDLE Adapter);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes the WireGuard driver if there are no more adapters in use.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_DELETE_DRIVER_FUNC)(VOID);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the LUID of the adapter.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param Luid Pointer to LUID to receive adapter LUID.
|
||||||
|
*/
|
||||||
|
typedef VOID(WINAPI WIREGUARD_GET_ADAPTER_LUID_FUNC)(_In_ WIREGUARD_ADAPTER_HANDLE Adapter, _Out_ NET_LUID *Luid);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines the version of the WireGuard driver currently loaded.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is the version number. If the function fails, the return value is
|
||||||
|
* zero. To get extended error information, call GetLastError. Possible errors include the following:
|
||||||
|
* ERROR_FILE_NOT_FOUND WireGuard not loaded
|
||||||
|
*/
|
||||||
|
typedef _Return_type_success_(return != 0)
|
||||||
|
DWORD(WINAPI WIREGUARD_GET_RUNNING_DRIVER_VERSION_FUNC)(VOID);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines the level of logging, passed to WIREGUARD_LOGGER_CALLBACK.
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
WIREGUARD_LOG_INFO, /**< Informational */
|
||||||
|
WIREGUARD_LOG_WARN, /**< Warning */
|
||||||
|
WIREGUARD_LOG_ERR /**< Error */
|
||||||
|
} WIREGUARD_LOGGER_LEVEL;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called by internal logger to report diagnostic messages
|
||||||
|
*
|
||||||
|
* @param Level Message level.
|
||||||
|
*
|
||||||
|
* @param Timestamp Message timestamp in in 100ns intervals since 1601-01-01 UTC.
|
||||||
|
*
|
||||||
|
* @param Message Message text.
|
||||||
|
*/
|
||||||
|
typedef VOID(CALLBACK *WIREGUARD_LOGGER_CALLBACK)(
|
||||||
|
_In_ WIREGUARD_LOGGER_LEVEL Level,
|
||||||
|
_In_ DWORD64 Timestamp,
|
||||||
|
_In_z_ LPCWSTR Message);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets logger callback function.
|
||||||
|
*
|
||||||
|
* @param NewLogger Pointer to callback function to use as a new global logger. NewLogger may be called from various
|
||||||
|
* threads concurrently. Should the logging require serialization, you must handle serialization in
|
||||||
|
* NewLogger. Set to NULL to disable.
|
||||||
|
*/
|
||||||
|
typedef VOID(WINAPI WIREGUARD_SET_LOGGER_FUNC)(_In_ WIREGUARD_LOGGER_CALLBACK NewLogger);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether and how logs from the driver are collected for the callback function.
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
WIREGUARD_ADAPTER_LOG_OFF, /**< No logs are generated from the driver. */
|
||||||
|
WIREGUARD_ADAPTER_LOG_ON, /**< Logs are generated from the driver. */
|
||||||
|
WIREGUARD_ADAPTER_LOG_ON_WITH_PREFIX /**< Logs are generated from the driver, index-prefixed. */
|
||||||
|
} WIREGUARD_ADAPTER_LOG_STATE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether and how the adapter logs to the logger previously set up with WireGuardSetLogger.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param LogState Adapter logging state.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_SET_ADAPTER_LOGGING_FUNC)
|
||||||
|
(_In_ WIREGUARD_ADAPTER_HANDLE Adapter, _In_ WIREGUARD_ADAPTER_LOG_STATE LogState);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines the state of the adapter.
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
WIREGUARD_ADAPTER_STATE_DOWN, /**< Down */
|
||||||
|
WIREGUARD_ADAPTER_STATE_UP, /**< Up */
|
||||||
|
} WIREGUARD_ADAPTER_STATE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the adapter state of the WireGuard adapter. Note: sockets are owned by the process that sets the state to up.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param State Adapter state.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_SET_ADAPTER_STATE_FUNC)
|
||||||
|
(_In_ WIREGUARD_ADAPTER_HANDLE Adapter, _In_ WIREGUARD_ADAPTER_STATE State);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the adapter state of the WireGuard adapter.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param State Pointer to adapter state.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Must_inspect_result_
|
||||||
|
_Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_GET_ADAPTER_STATE_FUNC)
|
||||||
|
(_In_ WIREGUARD_ADAPTER_HANDLE Adapter, _Out_ WIREGUARD_ADAPTER_STATE *State);
|
||||||
|
|
||||||
|
#define WIREGUARD_KEY_LENGTH 32
|
||||||
|
|
||||||
|
typedef struct _WIREGUARD_ALLOWED_IP WIREGUARD_ALLOWED_IP;
|
||||||
|
struct ALIGNED(8) _WIREGUARD_ALLOWED_IP
|
||||||
|
{
|
||||||
|
union
|
||||||
|
{
|
||||||
|
IN_ADDR V4;
|
||||||
|
IN6_ADDR V6;
|
||||||
|
} Address; /**< IP address */
|
||||||
|
ADDRESS_FAMILY AddressFamily; /**< Address family, either AF_INET or AF_INET6 */
|
||||||
|
BYTE Cidr; /**< CIDR of allowed IPs */
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
WIREGUARD_PEER_HAS_PUBLIC_KEY = 1 << 0, /**< The PublicKey field is set */
|
||||||
|
WIREGUARD_PEER_HAS_PRESHARED_KEY = 1 << 1, /**< The PresharedKey field is set */
|
||||||
|
WIREGUARD_PEER_HAS_PERSISTENT_KEEPALIVE = 1 << 2, /**< The PersistentKeepAlive field is set */
|
||||||
|
WIREGUARD_PEER_HAS_ENDPOINT = 1 << 3, /**< The Endpoint field is set */
|
||||||
|
WIREGUARD_PEER_REPLACE_ALLOWED_IPS = 1 << 5, /**< Remove all allowed IPs before adding new ones */
|
||||||
|
WIREGUARD_PEER_REMOVE = 1 << 6, /**< Remove specified peer */
|
||||||
|
WIREGUARD_PEER_UPDATE = 1 << 7 /**< Do not add a new peer */
|
||||||
|
} WIREGUARD_PEER_FLAG;
|
||||||
|
|
||||||
|
typedef struct _WIREGUARD_PEER WIREGUARD_PEER;
|
||||||
|
struct ALIGNED(8) _WIREGUARD_PEER
|
||||||
|
{
|
||||||
|
WIREGUARD_PEER_FLAG Flags; /**< Bitwise combination of flags */
|
||||||
|
DWORD Reserved; /**< Reserved; must be zero */
|
||||||
|
BYTE PublicKey[WIREGUARD_KEY_LENGTH]; /**< Public key, the peer's primary identifier */
|
||||||
|
BYTE PresharedKey[WIREGUARD_KEY_LENGTH]; /**< Preshared key for additional layer of post-quantum resistance */
|
||||||
|
WORD PersistentKeepalive; /**< Seconds interval, or 0 to disable */
|
||||||
|
SOCKADDR_INET Endpoint; /**< Endpoint, with IP address and UDP port number*/
|
||||||
|
DWORD64 TxBytes; /**< Number of bytes transmitted */
|
||||||
|
DWORD64 RxBytes; /**< Number of bytes received */
|
||||||
|
DWORD64 LastHandshake; /**< Time of the last handshake, in 100ns intervals since 1601-01-01 UTC */
|
||||||
|
DWORD AllowedIPsCount; /**< Number of allowed IP structs following this struct */
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
WIREGUARD_INTERFACE_HAS_PUBLIC_KEY = (1 << 0), /**< The PublicKey field is set */
|
||||||
|
WIREGUARD_INTERFACE_HAS_PRIVATE_KEY = (1 << 1), /**< The PrivateKey field is set */
|
||||||
|
WIREGUARD_INTERFACE_HAS_LISTEN_PORT = (1 << 2), /**< The ListenPort field is set */
|
||||||
|
WIREGUARD_INTERFACE_REPLACE_PEERS = (1 << 3) /**< Remove all peers before adding new ones */
|
||||||
|
} WIREGUARD_INTERFACE_FLAG;
|
||||||
|
|
||||||
|
typedef struct _WIREGUARD_INTERFACE WIREGUARD_INTERFACE;
|
||||||
|
struct ALIGNED(8) _WIREGUARD_INTERFACE
|
||||||
|
{
|
||||||
|
WIREGUARD_INTERFACE_FLAG Flags; /**< Bitwise combination of flags */
|
||||||
|
WORD ListenPort; /**< Port for UDP listen socket, or 0 to choose randomly */
|
||||||
|
BYTE PrivateKey[WIREGUARD_KEY_LENGTH]; /**< Private key of interface */
|
||||||
|
BYTE PublicKey[WIREGUARD_KEY_LENGTH]; /**< Corresponding public key of private key */
|
||||||
|
DWORD PeersCount; /**< Number of peer structs following this struct */
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the configuration of the WireGuard adapter.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param Config Configuration for the adapter.
|
||||||
|
*
|
||||||
|
* @param Bytes Number of bytes in Config allocation.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError.
|
||||||
|
*/
|
||||||
|
typedef _Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_SET_CONFIGURATION_FUNC)
|
||||||
|
(_In_ WIREGUARD_ADAPTER_HANDLE Adapter, _In_reads_bytes_(Bytes) const WIREGUARD_INTERFACE *Config, _In_ DWORD Bytes);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the configuration of the WireGuard adapter.
|
||||||
|
*
|
||||||
|
* @param Adapter Adapter handle obtained with WireGuardCreateAdapter or WireGuardOpenAdapter
|
||||||
|
*
|
||||||
|
* @param Config Configuration for the adapter.
|
||||||
|
*
|
||||||
|
* @param Bytes Pointer to number of bytes in Config allocation.
|
||||||
|
*
|
||||||
|
* @return If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To
|
||||||
|
* get extended error information, call GetLastError, which if ERROR_MORE_DATA, Bytes is updated with the
|
||||||
|
* required size.
|
||||||
|
*/
|
||||||
|
typedef _Must_inspect_result_
|
||||||
|
_Return_type_success_(return != FALSE)
|
||||||
|
BOOL(WINAPI WIREGUARD_GET_CONFIGURATION_FUNC)
|
||||||
|
(_In_ WIREGUARD_ADAPTER_HANDLE Adapter,
|
||||||
|
_Out_writes_bytes_all_(*Bytes) WIREGUARD_INTERFACE *Config,
|
||||||
|
_Inout_ DWORD *Bytes);
|
||||||
|
|
||||||
|
#pragma warning(pop)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
161
src/main/cpp/wireguard_wrapper.c
Normal file
161
src/main/cpp/wireguard_wrapper.c
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
#include <jni.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <windows.h>
|
||||||
|
#include "wireguard.h"
|
||||||
|
#include <string.h>
|
||||||
|
#include "tech_nevets_tvpn_wg_WireGuardJNI.h"
|
||||||
|
|
||||||
|
const char *APP_DIR = "C:\\Program Files\\TVPN\\";
|
||||||
|
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_createTunnel(JNIEnv *env, jobject obj, jstring tunnelName) {
|
||||||
|
const char *tunnelCharArr = (*env)->GetStringUTFChars(env, tunnelName, NULL);
|
||||||
|
if (tunnelCharArr == NULL) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *initialServiceName = "WireGuardTunnel$";
|
||||||
|
char *tnlName = malloc(strlen(initialServiceName) + strlen(tunnelCharArr) + 1);
|
||||||
|
strcpy(tnlName, initialServiceName);
|
||||||
|
strcat(tnlName, tunnelCharArr);
|
||||||
|
|
||||||
|
char *initialDisplayName = "WireGuard Tunnel: ";
|
||||||
|
char *displayName = malloc(strlen(initialDisplayName) + strlen(tunnelCharArr) + 1);
|
||||||
|
strcpy(displayName, initialDisplayName);
|
||||||
|
strcat(displayName, tunnelCharArr);
|
||||||
|
|
||||||
|
SC_HANDLE hSCManager = OpenSCManager(
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
SC_MANAGER_ALL_ACCESS
|
||||||
|
);
|
||||||
|
if (hSCManager == NULL) {
|
||||||
|
printf("OpenSCManager failed (%lu)\n", GetLastError());
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *params = "TVPN.exe /installtunnelservice ";
|
||||||
|
char *conf = ".conf";
|
||||||
|
char *exePath = malloc(strlen(APP_DIR) + strlen(params) + strlen(tunnelCharArr) + strlen(conf) + 1);
|
||||||
|
strcpy(exePath, APP_DIR);
|
||||||
|
strcat(exePath, params);
|
||||||
|
strcat(exePath, tunnelCharArr);
|
||||||
|
strcat(exePath, conf);
|
||||||
|
|
||||||
|
SC_HANDLE hService = CreateServiceA(
|
||||||
|
hSCManager,
|
||||||
|
tnlName,
|
||||||
|
displayName,
|
||||||
|
SERVICE_ALL_ACCESS,
|
||||||
|
SERVICE_WIN32_OWN_PROCESS,
|
||||||
|
SERVICE_AUTO_START,
|
||||||
|
SERVICE_ERROR_NORMAL,
|
||||||
|
exePath,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
"Nsi\0TcpIp\0\0",
|
||||||
|
NULL,
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
DWORD sid_info = SERVICE_SID_TYPE_UNRESTRICTED;
|
||||||
|
|
||||||
|
if (!ChangeServiceConfig2A(hService, SERVICE_CONFIG_SERVICE_SID_INFO, &sid_info)) {
|
||||||
|
printf("ChangeServiceConfig2W failed (%lu)\n", GetLastError());
|
||||||
|
(*env)->ReleaseStringUTFChars(env, tunnelName, tunnelCharArr);
|
||||||
|
free(tnlName);
|
||||||
|
free(displayName);
|
||||||
|
free(exePath);
|
||||||
|
CloseServiceHandle(hSCManager);
|
||||||
|
CloseServiceHandle(hService);
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
(*env)->ReleaseStringUTFChars(env, tunnelName, tunnelCharArr);
|
||||||
|
free(tnlName);
|
||||||
|
free(displayName);
|
||||||
|
free(exePath);
|
||||||
|
CloseServiceHandle(hSCManager);
|
||||||
|
CloseServiceHandle(hService);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_deleteTunnel(JNIEnv *env, jobject obj, jstring tunnelName) {
|
||||||
|
const char *nativeString = (*env)->GetStringUTFChars(env, tunnelName, NULL);
|
||||||
|
|
||||||
|
char *initialServiceName = "WireGuardTunnel$";
|
||||||
|
char *tnlName = malloc(strlen(initialServiceName) + strlen(nativeString) + 1);
|
||||||
|
strcpy(tnlName, initialServiceName);
|
||||||
|
strcat(tnlName, nativeString);
|
||||||
|
|
||||||
|
SC_HANDLE hSCManager = OpenSCManager(
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
SC_MANAGER_ALL_ACCESS
|
||||||
|
);
|
||||||
|
if (hSCManager == NULL) {
|
||||||
|
// Handle error
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
SC_HANDLE hService = OpenServiceA(hSCManager, tnlName, DELETE);
|
||||||
|
if (hService != NULL) {
|
||||||
|
if (!DeleteService(hService)) {
|
||||||
|
// Handle error
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
CloseServiceHandle(hService);
|
||||||
|
} else {
|
||||||
|
// Handle error
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
CloseServiceHandle(hSCManager);
|
||||||
|
(*env)->ReleaseStringUTFChars(env, tunnelName, nativeString);
|
||||||
|
free(tnlName);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT jint JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_initializeWireGuard(JNIEnv *env, jobject obj, jstring configFilePath) {
|
||||||
|
const char *nativeString = (*env)->GetStringUTFChars(env, configFilePath, 0);
|
||||||
|
|
||||||
|
int confLength = strlen(nativeString);
|
||||||
|
|
||||||
|
(*env)->ReleaseStringUTFChars(env, configFilePath, nativeString);
|
||||||
|
|
||||||
|
return confLength;
|
||||||
|
|
||||||
|
// const char *nativeConfigFilePath = (*env)->GetStringUTFChars(env, configFilePath, 0);
|
||||||
|
|
||||||
|
// Load the WireGuard DLL dynamically
|
||||||
|
// hInstLibrary = LoadLibrary("tunnel.dll"); // Adjust with the actual DLL name
|
||||||
|
|
||||||
|
// if (hInstLibrary) {
|
||||||
|
// Example: Load the WireGuard function from DLL
|
||||||
|
// wg_func_t wg_init_func = (wg_func_t) GetProcAddress(hInstLibrary, "WireGuardInitFunction"); // Adjust based on the WireGuard API
|
||||||
|
|
||||||
|
|
||||||
|
// if (wg_init_func) {
|
||||||
|
// wg_init_func(nativeConfigFilePath);
|
||||||
|
// (*env)->ReleaseStringUTFChars(env, configFilePath, nativeConfigFilePath);
|
||||||
|
// return 0; // Success
|
||||||
|
// } else {
|
||||||
|
// printf("Failed to get function from WireGuard DLL\n");
|
||||||
|
// return -2; // Failed to get function
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// printf("Failed to load WireGuard DLL\n");
|
||||||
|
// return -1; // Failed to load DLL
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT void JNICALL Java_tech_nevets_tvpn_wg_WireGuardJNI_cleanup(JNIEnv *env, jobject obj) {
|
||||||
|
printf("Silly goose, this isn't implemented yet!\n");
|
||||||
|
|
||||||
|
// if (hInstLibrary) {
|
||||||
|
// FreeLibrary(hInstLibrary);
|
||||||
|
// }
|
||||||
|
}
|
@ -1,770 +0,0 @@
|
|||||||
// Copyright (c) 2006 Damien Miller <djm@mindrot.org>
|
|
||||||
//
|
|
||||||
// Permission to use, copy, modify, and distribute this software for any
|
|
||||||
// purpose with or without fee is hereby granted, provided that the above
|
|
||||||
// copyright notice and this permission notice appear in all copies.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
|
|
||||||
package org.mindrot.jbcrypt;
|
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BCrypt implements OpenBSD-style Blowfish password hashing using
|
|
||||||
* the scheme described in "A Future-Adaptable Password Scheme" by
|
|
||||||
* Niels Provos and David Mazieres.
|
|
||||||
* <p>
|
|
||||||
* This password hashing system tries to thwart off-line password
|
|
||||||
* cracking using a computationally-intensive hashing algorithm,
|
|
||||||
* based on Bruce Schneier's Blowfish cipher. The work factor of
|
|
||||||
* the algorithm is parameterised, so it can be increased as
|
|
||||||
* computers get faster.
|
|
||||||
* <p>
|
|
||||||
* Usage is really simple. To hash a password for the first time,
|
|
||||||
* call the hashpw method with a random salt, like this:
|
|
||||||
* <p>
|
|
||||||
* <code>
|
|
||||||
* String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
|
|
||||||
* </code>
|
|
||||||
* <p>
|
|
||||||
* To check whether a plaintext password matches one that has been
|
|
||||||
* hashed previously, use the checkpw method:
|
|
||||||
* <p>
|
|
||||||
* <code>
|
|
||||||
* if (BCrypt.checkpw(candidate_password, stored_hash))<br />
|
|
||||||
* System.out.println("It matches");<br />
|
|
||||||
* else<br />
|
|
||||||
* System.out.println("It does not match");<br />
|
|
||||||
* </code>
|
|
||||||
* <p>
|
|
||||||
* The gensalt() method takes an optional parameter (log_rounds)
|
|
||||||
* that determines the computational complexity of the hashing:
|
|
||||||
* <p>
|
|
||||||
* <code>
|
|
||||||
* String strong_salt = BCrypt.gensalt(10)<br />
|
|
||||||
* String stronger_salt = BCrypt.gensalt(12)<br />
|
|
||||||
* </code>
|
|
||||||
* <p>
|
|
||||||
* The amount of work increases exponentially (2**log_rounds), so
|
|
||||||
* each increment is twice as much work. The default log_rounds is
|
|
||||||
* 10, and the valid range is 4 to 30.
|
|
||||||
*
|
|
||||||
* @author Damien Miller
|
|
||||||
* @version 0.2
|
|
||||||
*/
|
|
||||||
public class BCrypt {
|
|
||||||
// BCrypt parameters
|
|
||||||
private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
|
|
||||||
private static final int BCRYPT_SALT_LEN = 16;
|
|
||||||
|
|
||||||
// Blowfish parameters
|
|
||||||
private static final int BLOWFISH_NUM_ROUNDS = 16;
|
|
||||||
|
|
||||||
// Initial contents of key schedule
|
|
||||||
private static final int[] P_orig = {
|
|
||||||
0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
|
|
||||||
0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
|
|
||||||
0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
|
|
||||||
0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
|
|
||||||
0x9216d5d9, 0x8979fb1b
|
|
||||||
};
|
|
||||||
private static final int[] S_orig = {
|
|
||||||
0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
|
|
||||||
0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
|
|
||||||
0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
|
|
||||||
0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
|
|
||||||
0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
|
|
||||||
0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
|
|
||||||
0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
|
|
||||||
0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
|
|
||||||
0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
|
|
||||||
0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
|
|
||||||
0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
|
|
||||||
0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
|
|
||||||
0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
|
|
||||||
0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
|
|
||||||
0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
|
|
||||||
0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
|
|
||||||
0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
|
|
||||||
0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
|
|
||||||
0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
|
|
||||||
0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
|
|
||||||
0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
|
|
||||||
0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
|
|
||||||
0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
|
|
||||||
0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
|
|
||||||
0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
|
|
||||||
0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
|
|
||||||
0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
|
|
||||||
0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
|
|
||||||
0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
|
|
||||||
0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
|
|
||||||
0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
|
|
||||||
0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
|
|
||||||
0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
|
|
||||||
0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
|
|
||||||
0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
|
|
||||||
0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
|
|
||||||
0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
|
|
||||||
0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
|
|
||||||
0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
|
|
||||||
0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
|
|
||||||
0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
|
|
||||||
0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
|
|
||||||
0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
|
|
||||||
0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
|
|
||||||
0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
|
|
||||||
0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
|
|
||||||
0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
|
|
||||||
0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
|
|
||||||
0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
|
|
||||||
0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
|
|
||||||
0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
|
|
||||||
0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
|
|
||||||
0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
|
|
||||||
0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
|
|
||||||
0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
|
|
||||||
0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
|
|
||||||
0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
|
|
||||||
0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
|
|
||||||
0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
|
|
||||||
0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
|
|
||||||
0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
|
|
||||||
0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
|
|
||||||
0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
|
|
||||||
0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
|
|
||||||
0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
|
|
||||||
0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
|
|
||||||
0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
|
|
||||||
0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
|
|
||||||
0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
|
|
||||||
0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
|
|
||||||
0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
|
|
||||||
0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
|
|
||||||
0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
|
|
||||||
0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
|
|
||||||
0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
|
|
||||||
0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
|
|
||||||
0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
|
|
||||||
0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
|
|
||||||
0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
|
|
||||||
0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
|
|
||||||
0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
|
|
||||||
0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
|
|
||||||
0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
|
|
||||||
0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
|
|
||||||
0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
|
|
||||||
0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
|
|
||||||
0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
|
|
||||||
0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
|
|
||||||
0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
|
|
||||||
0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
|
|
||||||
0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
|
|
||||||
0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
|
|
||||||
0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
|
|
||||||
0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
|
|
||||||
0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
|
|
||||||
0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
|
|
||||||
0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
|
|
||||||
0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
|
|
||||||
0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
|
|
||||||
0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
|
|
||||||
0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
|
|
||||||
0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
|
|
||||||
0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
|
|
||||||
0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
|
|
||||||
0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
|
|
||||||
0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
|
|
||||||
0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
|
|
||||||
0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
|
|
||||||
0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
|
|
||||||
0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
|
|
||||||
0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
|
|
||||||
0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
|
|
||||||
0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
|
|
||||||
0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
|
|
||||||
0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
|
|
||||||
0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
|
|
||||||
0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
|
|
||||||
0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
|
|
||||||
0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
|
|
||||||
0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
|
|
||||||
0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
|
|
||||||
0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
|
|
||||||
0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
|
|
||||||
0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
|
|
||||||
0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
|
|
||||||
0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
|
|
||||||
0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
|
|
||||||
0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
|
|
||||||
0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
|
|
||||||
0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
|
|
||||||
0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
|
|
||||||
0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
|
|
||||||
0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
|
|
||||||
0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
|
|
||||||
0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
|
|
||||||
0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
|
|
||||||
0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
|
|
||||||
0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
|
|
||||||
0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
|
|
||||||
0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
|
|
||||||
0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
|
|
||||||
0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
|
|
||||||
0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
|
|
||||||
0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
|
|
||||||
0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
|
|
||||||
0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
|
|
||||||
0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
|
|
||||||
0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
|
|
||||||
0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
|
|
||||||
0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
|
|
||||||
0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
|
|
||||||
0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
|
|
||||||
0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
|
|
||||||
0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
|
|
||||||
0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
|
|
||||||
0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
|
|
||||||
0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
|
|
||||||
0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
|
|
||||||
0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
|
|
||||||
0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
|
|
||||||
0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
|
|
||||||
0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
|
|
||||||
0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
|
|
||||||
0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
|
|
||||||
0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
|
|
||||||
0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
|
|
||||||
0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
|
|
||||||
0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
|
|
||||||
0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
|
|
||||||
0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
|
|
||||||
0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
|
|
||||||
0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
|
|
||||||
0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
|
|
||||||
0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
|
|
||||||
0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
|
|
||||||
0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
|
|
||||||
0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
|
|
||||||
0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
|
|
||||||
0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
|
|
||||||
0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
|
|
||||||
0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
|
|
||||||
0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
|
|
||||||
0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
|
|
||||||
0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
|
|
||||||
0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
|
|
||||||
0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
|
|
||||||
0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
|
|
||||||
0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
|
|
||||||
0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
|
|
||||||
0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
|
|
||||||
0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
|
|
||||||
0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
|
|
||||||
0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
|
|
||||||
0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
|
|
||||||
0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
|
|
||||||
0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
|
|
||||||
0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
|
|
||||||
0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
|
|
||||||
0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
|
|
||||||
0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
|
|
||||||
0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
|
|
||||||
0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
|
|
||||||
0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
|
|
||||||
0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
|
|
||||||
0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
|
|
||||||
0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
|
|
||||||
0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
|
|
||||||
0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
|
|
||||||
0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
|
|
||||||
0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
|
|
||||||
0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
|
|
||||||
0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
|
|
||||||
0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
|
|
||||||
0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
|
|
||||||
0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
|
|
||||||
0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
|
|
||||||
0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
|
|
||||||
0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
|
|
||||||
0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
|
|
||||||
0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
|
|
||||||
0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
|
|
||||||
0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
|
|
||||||
0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
|
|
||||||
0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
|
|
||||||
0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
|
|
||||||
0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
|
|
||||||
0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
|
|
||||||
0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
|
|
||||||
0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
|
|
||||||
0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
|
|
||||||
0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
|
|
||||||
0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
|
|
||||||
0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
|
|
||||||
0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
|
|
||||||
0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
|
|
||||||
0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
|
|
||||||
0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
|
|
||||||
0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
|
|
||||||
0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
|
|
||||||
0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
|
|
||||||
0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
|
|
||||||
0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
|
|
||||||
0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
|
|
||||||
0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
|
|
||||||
0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
|
|
||||||
0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
|
|
||||||
0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
|
|
||||||
0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
|
|
||||||
0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
|
|
||||||
0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
|
|
||||||
0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
|
|
||||||
0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
|
|
||||||
0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
|
|
||||||
0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
|
|
||||||
0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
|
|
||||||
0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
|
|
||||||
};
|
|
||||||
|
|
||||||
// bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls
|
|
||||||
// this "ciphertext", but it is really plaintext or an IV. We keep
|
|
||||||
// the name to make code comparison easier.
|
|
||||||
static private final int[] bf_crypt_ciphertext = {
|
|
||||||
0x4f727068, 0x65616e42, 0x65686f6c,
|
|
||||||
0x64657253, 0x63727944, 0x6f756274
|
|
||||||
};
|
|
||||||
|
|
||||||
// Table for Base64 encoding
|
|
||||||
static private final char[] base64_code = {
|
|
||||||
'.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
|
|
||||||
'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
|
|
||||||
'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
|
|
||||||
'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
|
|
||||||
'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
|
|
||||||
'6', '7', '8', '9'
|
|
||||||
};
|
|
||||||
|
|
||||||
// Table for Base64 decoding
|
|
||||||
static private final byte[] index_64 = {
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
|
|
||||||
-1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
|
|
||||||
56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
|
|
||||||
-1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
|
|
||||||
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
|
||||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
|
|
||||||
-1, -1, -1, -1, -1, -1, 28, 29, 30,
|
|
||||||
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
|
|
||||||
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
|
|
||||||
51, 52, 53, -1, -1, -1, -1, -1
|
|
||||||
};
|
|
||||||
|
|
||||||
// Expanded Blowfish key
|
|
||||||
private int[] P;
|
|
||||||
private int[] S;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encode a byte array using bcrypt's slightly-modified base64
|
|
||||||
* encoding scheme. Note that this is *not* compatible with
|
|
||||||
* the standard MIME-base64 encoding.
|
|
||||||
*
|
|
||||||
* @param d the byte array to encode
|
|
||||||
* @param len the number of bytes to encode
|
|
||||||
* @return base64-encoded string
|
|
||||||
* @exception IllegalArgumentException if the length is invalid
|
|
||||||
*/
|
|
||||||
private static String encode_base64(byte[] d, int len)
|
|
||||||
throws IllegalArgumentException {
|
|
||||||
int off = 0;
|
|
||||||
StringBuilder rs = new StringBuilder();
|
|
||||||
int c1, c2;
|
|
||||||
|
|
||||||
if (len <= 0 || len > d.length)
|
|
||||||
throw new IllegalArgumentException ("Invalid len");
|
|
||||||
|
|
||||||
while (off < len) {
|
|
||||||
c1 = d[off++] & 0xff;
|
|
||||||
rs.append(base64_code[(c1 >> 2) & 0x3f]);
|
|
||||||
c1 = (c1 & 0x03) << 4;
|
|
||||||
if (off >= len) {
|
|
||||||
rs.append(base64_code[c1 & 0x3f]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
c2 = d[off++] & 0xff;
|
|
||||||
c1 |= (c2 >> 4) & 0x0f;
|
|
||||||
rs.append(base64_code[c1 & 0x3f]);
|
|
||||||
c1 = (c2 & 0x0f) << 2;
|
|
||||||
if (off >= len) {
|
|
||||||
rs.append(base64_code[c1 & 0x3f]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
c2 = d[off++] & 0xff;
|
|
||||||
c1 |= (c2 >> 6) & 0x03;
|
|
||||||
rs.append(base64_code[c1 & 0x3f]);
|
|
||||||
rs.append(base64_code[c2 & 0x3f]);
|
|
||||||
}
|
|
||||||
return rs.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Look up the 3 bits base64-encoded by the specified character,
|
|
||||||
* range-checking againt conversion table
|
|
||||||
* @param x the base64-encoded value
|
|
||||||
* @return the decoded value of x
|
|
||||||
*/
|
|
||||||
private static byte char64(char x) {
|
|
||||||
if ((int) x > index_64.length)
|
|
||||||
return -1;
|
|
||||||
return index_64[(int)x];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decode a string encoded using bcrypt's base64 scheme to a
|
|
||||||
* byte array. Note that this is *not* compatible with
|
|
||||||
* the standard MIME-base64 encoding.
|
|
||||||
* @param s the string to decode
|
|
||||||
* @param maxolen the maximum number of bytes to decode
|
|
||||||
* @return an array containing the decoded bytes
|
|
||||||
* @throws IllegalArgumentException if maxolen is invalid
|
|
||||||
*/
|
|
||||||
private static byte[] decode_base64(String s, int maxolen)
|
|
||||||
throws IllegalArgumentException {
|
|
||||||
StringBuilder rs = new StringBuilder();
|
|
||||||
int off = 0, slen = s.length(), olen = 0;
|
|
||||||
byte[] ret;
|
|
||||||
byte c1, c2, c3, c4, o;
|
|
||||||
|
|
||||||
if (maxolen <= 0)
|
|
||||||
throw new IllegalArgumentException ("Invalid maxolen");
|
|
||||||
|
|
||||||
while (off < slen - 1 && olen < maxolen) {
|
|
||||||
c1 = char64(s.charAt(off++));
|
|
||||||
c2 = char64(s.charAt(off++));
|
|
||||||
if (c1 == -1 || c2 == -1)
|
|
||||||
break;
|
|
||||||
o = (byte)(c1 << 2);
|
|
||||||
o |= (byte) ((c2 & 0x30) >> 4);
|
|
||||||
rs.append((char)o);
|
|
||||||
if (++olen >= maxolen || off >= slen)
|
|
||||||
break;
|
|
||||||
c3 = char64(s.charAt(off++));
|
|
||||||
if (c3 == -1)
|
|
||||||
break;
|
|
||||||
o = (byte)((c2 & 0x0f) << 4);
|
|
||||||
o |= (byte) ((c3 & 0x3c) >> 2);
|
|
||||||
rs.append((char)o);
|
|
||||||
if (++olen >= maxolen || off >= slen)
|
|
||||||
break;
|
|
||||||
c4 = char64(s.charAt(off++));
|
|
||||||
o = (byte)((c3 & 0x03) << 6);
|
|
||||||
o |= c4;
|
|
||||||
rs.append((char)o);
|
|
||||||
++olen;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = new byte[olen];
|
|
||||||
for (off = 0; off < olen; off++)
|
|
||||||
ret[off] = (byte)rs.charAt(off);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Blowfish encipher a single 64-bit block encoded as
|
|
||||||
* two 32-bit halves
|
|
||||||
* @param lr an array containing the two 32-bit half blocks
|
|
||||||
* @param off the position in the array of the blocks
|
|
||||||
*/
|
|
||||||
private final void encipher(int[] lr, int off) {
|
|
||||||
int i, n, l = lr[off], r = lr[off + 1];
|
|
||||||
|
|
||||||
l ^= P[0];
|
|
||||||
for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
|
|
||||||
// Feistel substitution on left word
|
|
||||||
n = S[(l >> 24) & 0xff];
|
|
||||||
n += S[0x100 | ((l >> 16) & 0xff)];
|
|
||||||
n ^= S[0x200 | ((l >> 8) & 0xff)];
|
|
||||||
n += S[0x300 | (l & 0xff)];
|
|
||||||
r ^= n ^ P[++i];
|
|
||||||
|
|
||||||
// Feistel substitution on right word
|
|
||||||
n = S[(r >> 24) & 0xff];
|
|
||||||
n += S[0x100 | ((r >> 16) & 0xff)];
|
|
||||||
n ^= S[0x200 | ((r >> 8) & 0xff)];
|
|
||||||
n += S[0x300 | (r & 0xff)];
|
|
||||||
l ^= n ^ P[++i];
|
|
||||||
}
|
|
||||||
lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
|
|
||||||
lr[off + 1] = l;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cycically extract a word of key material
|
|
||||||
* @param data the string to extract the data from
|
|
||||||
* @param offp a "pointer" (as a one-entry array) to the
|
|
||||||
* current offset into data
|
|
||||||
* @return the next word of material from data
|
|
||||||
*/
|
|
||||||
private static int streamtoword(byte[] data, int[] offp) {
|
|
||||||
int i;
|
|
||||||
int word = 0;
|
|
||||||
int off = offp[0];
|
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
|
||||||
word = (word << 8) | (data[off] & 0xff);
|
|
||||||
off = (off + 1) % data.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
offp[0] = off;
|
|
||||||
return word;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialise the Blowfish key schedule
|
|
||||||
*/
|
|
||||||
private void init_key() {
|
|
||||||
P = (int[])P_orig.clone();
|
|
||||||
S = (int[])S_orig.clone();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Key the Blowfish cipher
|
|
||||||
* @param key an array containing the key
|
|
||||||
*/
|
|
||||||
private void key(byte[] key) {
|
|
||||||
int i;
|
|
||||||
int[] koffp = { 0 };
|
|
||||||
int[] lr = { 0, 0 };
|
|
||||||
int plen = P.length, slen = S.length;
|
|
||||||
|
|
||||||
for (i = 0; i < plen; i++)
|
|
||||||
P[i] = P[i] ^ streamtoword(key, koffp);
|
|
||||||
|
|
||||||
for (i = 0; i < plen; i += 2) {
|
|
||||||
encipher(lr, 0);
|
|
||||||
P[i] = lr[0];
|
|
||||||
P[i + 1] = lr[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < slen; i += 2) {
|
|
||||||
encipher(lr, 0);
|
|
||||||
S[i] = lr[0];
|
|
||||||
S[i + 1] = lr[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform the "enhanced key schedule" step described by
|
|
||||||
* Provos and Mazieres in "A Future-Adaptable Password Scheme"
|
|
||||||
* http://www.openbsd.org/papers/bcrypt-paper.ps
|
|
||||||
* @param data salt information
|
|
||||||
* @param key password information
|
|
||||||
*/
|
|
||||||
private void ekskey(byte[] data, byte[] key) {
|
|
||||||
int i;
|
|
||||||
int[] koffp = { 0 }, doffp = { 0 };
|
|
||||||
int[] lr = { 0, 0 };
|
|
||||||
int plen = P.length, slen = S.length;
|
|
||||||
|
|
||||||
for (i = 0; i < plen; i++)
|
|
||||||
P[i] = P[i] ^ streamtoword(key, koffp);
|
|
||||||
|
|
||||||
for (i = 0; i < plen; i += 2) {
|
|
||||||
lr[0] ^= streamtoword(data, doffp);
|
|
||||||
lr[1] ^= streamtoword(data, doffp);
|
|
||||||
encipher(lr, 0);
|
|
||||||
P[i] = lr[0];
|
|
||||||
P[i + 1] = lr[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < slen; i += 2) {
|
|
||||||
lr[0] ^= streamtoword(data, doffp);
|
|
||||||
lr[1] ^= streamtoword(data, doffp);
|
|
||||||
encipher(lr, 0);
|
|
||||||
S[i] = lr[0];
|
|
||||||
S[i + 1] = lr[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform the central password hashing step in the
|
|
||||||
* bcrypt scheme
|
|
||||||
* @param password the password to hash
|
|
||||||
* @param salt the binary salt to hash with the password
|
|
||||||
* @param log_rounds the binary logarithm of the number
|
|
||||||
* of rounds of hashing to apply
|
|
||||||
* @param cdata the plaintext to encrypt
|
|
||||||
* @return an array containing the binary hashed password
|
|
||||||
*/
|
|
||||||
public byte[] crypt_raw(byte[] password, byte[] salt, int log_rounds,
|
|
||||||
int[] cdata) {
|
|
||||||
int rounds, i, j;
|
|
||||||
int clen = cdata.length;
|
|
||||||
byte[] ret;
|
|
||||||
|
|
||||||
if (log_rounds < 4 || log_rounds > 30)
|
|
||||||
throw new IllegalArgumentException ("Bad number of rounds");
|
|
||||||
rounds = 1 << log_rounds;
|
|
||||||
if (salt.length != BCRYPT_SALT_LEN)
|
|
||||||
throw new IllegalArgumentException ("Bad salt length");
|
|
||||||
|
|
||||||
init_key();
|
|
||||||
ekskey(salt, password);
|
|
||||||
for (i = 0; i != rounds; i++) {
|
|
||||||
key(password);
|
|
||||||
key(salt);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < 64; i++) {
|
|
||||||
for (j = 0; j < (clen >> 1); j++)
|
|
||||||
encipher(cdata, j << 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = new byte[clen * 4];
|
|
||||||
for (i = 0, j = 0; i < clen; i++) {
|
|
||||||
ret[j++] = (byte)((cdata[i] >> 24) & 0xff);
|
|
||||||
ret[j++] = (byte)((cdata[i] >> 16) & 0xff);
|
|
||||||
ret[j++] = (byte)((cdata[i] >> 8) & 0xff);
|
|
||||||
ret[j++] = (byte)(cdata[i] & 0xff);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hash a password using the OpenBSD bcrypt scheme
|
|
||||||
* @param password the password to hash
|
|
||||||
* @param salt the salt to hash with (perhaps generated
|
|
||||||
* using BCrypt.gensalt)
|
|
||||||
* @return the hashed password
|
|
||||||
*/
|
|
||||||
public static String hashpw(String password, String salt) {
|
|
||||||
BCrypt B;
|
|
||||||
String real_salt;
|
|
||||||
byte[] passwordb, saltb, hashed;
|
|
||||||
char minor = (char)0;
|
|
||||||
int rounds, off = 0;
|
|
||||||
StringBuilder rs = new StringBuilder();
|
|
||||||
|
|
||||||
if (salt.charAt(0) != '$' || salt.charAt(1) != '2')
|
|
||||||
throw new IllegalArgumentException ("Invalid salt version");
|
|
||||||
if (salt.charAt(2) == '$')
|
|
||||||
off = 3;
|
|
||||||
else {
|
|
||||||
minor = salt.charAt(2);
|
|
||||||
if (minor != 'a' || salt.charAt(3) != '$')
|
|
||||||
throw new IllegalArgumentException ("Invalid salt revision");
|
|
||||||
off = 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract number of rounds
|
|
||||||
if (salt.charAt(off + 2) > '$')
|
|
||||||
throw new IllegalArgumentException ("Missing salt rounds");
|
|
||||||
rounds = Integer.parseInt(salt.substring(off, off + 2));
|
|
||||||
|
|
||||||
real_salt = salt.substring(off + 3, off + 25);
|
|
||||||
passwordb = (password + (minor == 'a' ? "\000" : "")).getBytes(StandardCharsets.UTF_8);
|
|
||||||
|
|
||||||
saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
|
|
||||||
|
|
||||||
B = new BCrypt();
|
|
||||||
hashed = B.crypt_raw(passwordb, saltb, rounds,
|
|
||||||
(int[])bf_crypt_ciphertext.clone());
|
|
||||||
|
|
||||||
rs.append("$2");
|
|
||||||
if (minor == 'a')
|
|
||||||
rs.append(minor);
|
|
||||||
rs.append("$");
|
|
||||||
if (rounds < 10)
|
|
||||||
rs.append("0");
|
|
||||||
if (rounds > 30) {
|
|
||||||
throw new IllegalArgumentException(
|
|
||||||
"rounds exceeds maximum (30)");
|
|
||||||
}
|
|
||||||
rs.append(Integer.toString(rounds));
|
|
||||||
rs.append("$");
|
|
||||||
rs.append(encode_base64(saltb, saltb.length));
|
|
||||||
rs.append(encode_base64(hashed,
|
|
||||||
bf_crypt_ciphertext.length * 4 - 1));
|
|
||||||
return rs.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a salt for use with the BCrypt.hashpw() method
|
|
||||||
* @param log_rounds the log2 of the number of rounds of
|
|
||||||
* hashing to apply - the work factor therefore increases as
|
|
||||||
* 2**log_rounds.
|
|
||||||
* @param random an instance of SecureRandom to use
|
|
||||||
* @return an encoded salt value
|
|
||||||
*/
|
|
||||||
public static String gensalt(int log_rounds, SecureRandom random) {
|
|
||||||
StringBuilder rs = new StringBuilder();
|
|
||||||
byte[] rnd = new byte[BCRYPT_SALT_LEN];
|
|
||||||
|
|
||||||
random.nextBytes(rnd);
|
|
||||||
|
|
||||||
rs.append("$2a$");
|
|
||||||
if (log_rounds < 10)
|
|
||||||
rs.append("0");
|
|
||||||
if (log_rounds > 30) {
|
|
||||||
throw new IllegalArgumentException(
|
|
||||||
"log_rounds exceeds maximum (30)");
|
|
||||||
}
|
|
||||||
rs.append(Integer.toString(log_rounds));
|
|
||||||
rs.append("$");
|
|
||||||
rs.append(encode_base64(rnd, rnd.length));
|
|
||||||
return rs.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a salt for use with the BCrypt.hashpw() method
|
|
||||||
* @param log_rounds the log2 of the number of rounds of
|
|
||||||
* hashing to apply - the work factor therefore increases as
|
|
||||||
* 2**log_rounds.
|
|
||||||
* @return an encoded salt value
|
|
||||||
*/
|
|
||||||
public static String gensalt(int log_rounds) {
|
|
||||||
return gensalt(log_rounds, new SecureRandom());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a salt for use with the BCrypt.hashpw() method,
|
|
||||||
* selecting a reasonable default for the number of hashing
|
|
||||||
* rounds to apply
|
|
||||||
* @return an encoded salt value
|
|
||||||
*/
|
|
||||||
public static String gensalt() {
|
|
||||||
return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check that a plaintext password matches a previously hashed
|
|
||||||
* one
|
|
||||||
* @param plaintext the plaintext password to verify
|
|
||||||
* @param hashed the previously-hashed password
|
|
||||||
* @return true if the passwords match, false otherwise
|
|
||||||
*/
|
|
||||||
public static boolean checkpw(String plaintext, String hashed) {
|
|
||||||
byte[] hashed_bytes;
|
|
||||||
byte[] try_bytes;
|
|
||||||
String try_pw = hashpw(plaintext, hashed);
|
|
||||||
hashed_bytes = hashed.getBytes(StandardCharsets.UTF_8);
|
|
||||||
try_bytes = try_pw.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (hashed_bytes.length != try_bytes.length)
|
|
||||||
return false;
|
|
||||||
byte ret = 0;
|
|
||||||
for (int i = 0; i < try_bytes.length; i++)
|
|
||||||
ret |= (byte) (hashed_bytes[i] ^ try_bytes[i]);
|
|
||||||
return ret == 0;
|
|
||||||
}
|
|
||||||
}
|
|
48
src/main/java/tech/nevets/tvpn/LogOutputStream.java
Normal file
48
src/main/java/tech/nevets/tvpn/LogOutputStream.java
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
package tech.nevets.tvpn;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
|
||||||
|
public class LogOutputStream extends OutputStream {
|
||||||
|
private JTextArea textArea;
|
||||||
|
private FileOutputStream fileOut;
|
||||||
|
|
||||||
|
private final char[] buf = new char[4096];
|
||||||
|
private int pointer = 0;
|
||||||
|
|
||||||
|
public LogOutputStream() {
|
||||||
|
try {
|
||||||
|
this.fileOut = new FileOutputStream(Utils.APP_DIR + "/log.txt");
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println("Error Creating log stream: " + e.getMessage());
|
||||||
|
this.fileOut = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void initLogTab(JTextArea textArea) {
|
||||||
|
this.textArea = textArea;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void write(int b) throws IOException {
|
||||||
|
fileOut.write(b);
|
||||||
|
if ((char) b == '\n') {
|
||||||
|
flush();
|
||||||
|
pointer = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
buf[pointer] = (char) b;
|
||||||
|
pointer++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void flush() {
|
||||||
|
StringBuilder sb = new StringBuilder(pointer + 1);
|
||||||
|
for (int i = 0; i < pointer; i++) {
|
||||||
|
sb.append(buf[i]);
|
||||||
|
}
|
||||||
|
textArea.append(sb.toString());
|
||||||
|
}
|
||||||
|
}
|
43
src/main/java/tech/nevets/tvpn/Logger.java
Normal file
43
src/main/java/tech/nevets/tvpn/Logger.java
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
package tech.nevets.tvpn;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
public class Logger {
|
||||||
|
private static LogOutputStream logOut;
|
||||||
|
|
||||||
|
public static void loadLogOutStream(LogOutputStream lo) {
|
||||||
|
logOut = lo;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String className;
|
||||||
|
|
||||||
|
public Logger(Class<?> clazz) {
|
||||||
|
className = clazz.getSimpleName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void log(String message) {
|
||||||
|
write(message, "INFO");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void warn(String message) {
|
||||||
|
write(message, "WARN");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void error(String message) {
|
||||||
|
write(message, "ERROR");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void write(String message, String type) {
|
||||||
|
try {
|
||||||
|
logOut.write(("[" + className + "] (" + type + ") " + message + '\n').getBytes(StandardCharsets.UTF_8));
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println("Error logging message: " + e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
System.out.print("[" + className + "] (" + type + ") " + message + '\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -2,27 +2,33 @@ package tech.nevets.tvpn;
|
|||||||
|
|
||||||
import com.formdev.flatlaf.FlatDarkLaf;
|
import com.formdev.flatlaf.FlatDarkLaf;
|
||||||
import tech.nevets.tvpn.ui.UIManager;
|
import tech.nevets.tvpn.ui.UIManager;
|
||||||
|
import tech.nevets.tvpn.wg.WireGuardJNI;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class Main {
|
public class Main {
|
||||||
|
private static final Logger LOGGER = new Logger(Main.class);
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
LogOutputStream logOut = new LogOutputStream();
|
||||||
|
Logger.loadLogOutStream(logOut);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
javax.swing.UIManager.setLookAndFeel(new FlatDarkLaf());
|
javax.swing.UIManager.setLookAndFeel(new FlatDarkLaf());
|
||||||
} catch (UnsupportedLookAndFeelException e) {
|
} catch (UnsupportedLookAndFeelException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
File f = new File(Utils.APP_DIR + "/temp/");
|
File f = new File(Utils.APP_DIR + "/logs/");
|
||||||
f.delete();
|
if (!f.exists()) f.mkdirs();
|
||||||
f.mkdirs();
|
|
||||||
|
|
||||||
UIManager uim = new UIManager();
|
UIManager uim = new UIManager(logOut);
|
||||||
uim.startUIFrame();
|
|
||||||
uim.startLoginFrame();
|
uim.startLoginFrame();
|
||||||
|
|
||||||
|
WireGuardJNI wgjni = new WireGuardJNI();
|
||||||
|
//System.out.println(wgjni.createTunnel("test"));
|
||||||
|
System.out.println(wgjni.deleteTunnel("test"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,10 @@ import java.net.http.HttpResponse;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class Utils {
|
public class Utils {
|
||||||
|
private static final Logger LOGGER = new Logger(Utils.class);
|
||||||
public static final File APP_DIR = new File("./tvpn/");
|
public static final File APP_DIR = new File("./tvpn/");
|
||||||
public static final String WG_CONF_DIR = "C:\\Program Files\\WireGuard\\Data\\Configurations\\";
|
public static final String WG_CONF_DIR = "C:\\Program Files\\WireGuard\\Data\\Configurations\\";
|
||||||
public static final String API_ENDPOINT_BASE = "http://tvpn.lan/";
|
public static final String API_ENDPOINT_BASE = "http://tvpn.lan/testing/";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
if (!APP_DIR.exists()) APP_DIR.mkdirs();
|
if (!APP_DIR.exists()) APP_DIR.mkdirs();
|
||||||
@ -22,18 +23,7 @@ public class Utils {
|
|||||||
HttpRequest.Builder reqBuilder = HttpRequest.newBuilder()
|
HttpRequest.Builder reqBuilder = HttpRequest.newBuilder()
|
||||||
.GET()
|
.GET()
|
||||||
.uri(url);
|
.uri(url);
|
||||||
for (Map.Entry<String, String> header : headers.entrySet()) {
|
return req(headers, client, reqBuilder);
|
||||||
reqBuilder.header(header.getKey(), header.getValue());
|
|
||||||
}
|
|
||||||
HttpRequest req = reqBuilder.build();
|
|
||||||
HttpResponse<String> res;
|
|
||||||
try {
|
|
||||||
res = client.send(req, HttpResponse.BodyHandlers.ofString());
|
|
||||||
return res.body();
|
|
||||||
} catch (IOException | InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String post(URI url, Map<String, String> headers, HttpRequest.BodyPublisher bodyPub) {
|
public static String post(URI url, Map<String, String> headers, HttpRequest.BodyPublisher bodyPub) {
|
||||||
@ -41,6 +31,10 @@ public class Utils {
|
|||||||
HttpRequest.Builder reqBuilder = HttpRequest.newBuilder()
|
HttpRequest.Builder reqBuilder = HttpRequest.newBuilder()
|
||||||
.POST(bodyPub)
|
.POST(bodyPub)
|
||||||
.uri(url);
|
.uri(url);
|
||||||
|
return req(headers, client, reqBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String req(Map<String, String> headers, HttpClient client, HttpRequest.Builder reqBuilder) {
|
||||||
for (Map.Entry<String, String> header : headers.entrySet()) {
|
for (Map.Entry<String, String> header : headers.entrySet()) {
|
||||||
reqBuilder.header(header.getKey(), header.getValue());
|
reqBuilder.header(header.getKey(), header.getValue());
|
||||||
}
|
}
|
||||||
@ -50,8 +44,12 @@ public class Utils {
|
|||||||
res = client.send(req, HttpResponse.BodyHandlers.ofString());
|
res = client.send(req, HttpResponse.BodyHandlers.ofString());
|
||||||
return res.body();
|
return res.body();
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void throwException() throws RuntimeException {
|
||||||
|
throw new RuntimeException("Yay an exception!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package tech.nevets.tvpn.auth;
|
|||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
import tech.nevets.tvpn.Utils;
|
import tech.nevets.tvpn.Utils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -11,28 +12,10 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
public class AuthManager {
|
public class AuthManager {
|
||||||
|
|
||||||
public static UserToken serverAuth() {
|
private static final Logger LOGGER = new Logger(AuthManager.class);
|
||||||
CompletableFuture<String> cf = new CompletableFuture<>();
|
|
||||||
AuthServer as = new AuthServer(cf);
|
|
||||||
// TODO create new thread to handle login so the app doesn't hang while logging in
|
|
||||||
String response = cf.join();
|
|
||||||
String[] resSplit = response.split(":");
|
|
||||||
if (resSplit.length != 2) return new UserToken(false, "", 0, "Error");
|
|
||||||
UserToken userToken = new UserToken(true, resSplit[0], Long.parseLong(resSplit[1]), "");
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (userToken.getToken().isEmpty()) return userToken;
|
|
||||||
Files.writeString(Path.of(Utils.APP_DIR + "/token.txt"), userToken.getToken());
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return userToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static UserToken httpAuth(String username, String password) {
|
public static UserToken httpAuth(String username, String password) {
|
||||||
Map<String, String> headers = new HashMap<>();
|
Map<String, String> headers = new HashMap<>();
|
||||||
@ -49,7 +32,7 @@ public class AuthManager {
|
|||||||
if (token.getToken().isEmpty()) return token;
|
if (token.getToken().isEmpty()) return token;
|
||||||
Files.writeString(Path.of(Utils.APP_DIR + "/token.txt"), token.getToken());
|
Files.writeString(Path.of(Utils.APP_DIR + "/token.txt"), token.getToken());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return token;
|
return token;
|
||||||
|
@ -1,76 +0,0 @@
|
|||||||
package tech.nevets.tvpn.auth;
|
|
||||||
|
|
||||||
import com.sun.net.httpserver.Headers;
|
|
||||||
import com.sun.net.httpserver.HttpExchange;
|
|
||||||
import com.sun.net.httpserver.HttpHandler;
|
|
||||||
import com.sun.net.httpserver.HttpServer;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
public class AuthServer {
|
|
||||||
private HttpServer server;
|
|
||||||
|
|
||||||
public AuthServer(CompletableFuture<String> cf) {
|
|
||||||
try {
|
|
||||||
server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 8342), 0);
|
|
||||||
server.createContext("/", new AuthHandler(cf));
|
|
||||||
server.setExecutor(null);
|
|
||||||
server.start();
|
|
||||||
|
|
||||||
System.out.println("Server is running on port 8342");
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void stop() {
|
|
||||||
server.stop(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// define a custom HttpHandler
|
|
||||||
static class AuthHandler implements HttpHandler {
|
|
||||||
private CompletableFuture<String> cf;
|
|
||||||
|
|
||||||
public AuthHandler(CompletableFuture<String> cf) {
|
|
||||||
this.cf = cf;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handle(HttpExchange exchange) throws IOException {
|
|
||||||
// handle the request
|
|
||||||
Headers headers = exchange.getRequestHeaders();
|
|
||||||
List<String> strHeaders = headers.get("Token");
|
|
||||||
String response;
|
|
||||||
int status;
|
|
||||||
String token = "";
|
|
||||||
if (exchange.getRequestMethod().equals("POST")) {
|
|
||||||
if (strHeaders == null || strHeaders.isEmpty()) {
|
|
||||||
response = "Error, not token found.";
|
|
||||||
status = 412;
|
|
||||||
} else {
|
|
||||||
response = "Successfully authenticated, you can now return to the app!";
|
|
||||||
status = 200;
|
|
||||||
token = strHeaders.getFirst();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
response = "Invalid Request Method";
|
|
||||||
status = 405;
|
|
||||||
}
|
|
||||||
exchange.sendResponseHeaders(status, response.length());
|
|
||||||
OutputStream os = exchange.getResponseBody();
|
|
||||||
|
|
||||||
os.write(response.getBytes());
|
|
||||||
os.flush();
|
|
||||||
os.close();
|
|
||||||
|
|
||||||
if (status == 200) {
|
|
||||||
cf.complete(token);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,6 +1,7 @@
|
|||||||
package tech.nevets.tvpn.auth;
|
package tech.nevets.tvpn.auth;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
import tech.nevets.tvpn.Utils;
|
import tech.nevets.tvpn.Utils;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
@ -10,6 +11,8 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public class Session {
|
public class Session {
|
||||||
|
private static final Logger LOGGER = new Logger(Session.class);
|
||||||
|
|
||||||
private final UserToken token;
|
private final UserToken token;
|
||||||
|
|
||||||
public static Session loadSession() {
|
public static Session loadSession() {
|
||||||
@ -20,7 +23,7 @@ public class Session {
|
|||||||
BufferedReader br = Files.newBufferedReader(Path.of(Utils.APP_DIR + "/session.json"));
|
BufferedReader br = Files.newBufferedReader(Path.of(Utils.APP_DIR + "/session.json"));
|
||||||
return g.fromJson(br, Session.class);
|
return g.fromJson(br, Session.class);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@ -43,7 +46,7 @@ public class Session {
|
|||||||
try {
|
try {
|
||||||
Files.writeString(Path.of(Utils.APP_DIR + "/session.json"), new Gson().toJson(token));
|
Files.writeString(Path.of(Utils.APP_DIR + "/session.json"), new Gson().toJson(token));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,10 +6,10 @@ package tech.nevets.tvpn.ui;
|
|||||||
|
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.filechooser.FileFilter;
|
|
||||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||||
|
|
||||||
import net.miginfocom.swing.*;
|
import net.miginfocom.swing.*;
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
import tech.nevets.tvpn.Utils;
|
import tech.nevets.tvpn.Utils;
|
||||||
import tech.nevets.tvpn.wg.WireGuardHandler;
|
import tech.nevets.tvpn.wg.WireGuardHandler;
|
||||||
|
|
||||||
@ -22,13 +22,12 @@ import java.util.List;
|
|||||||
/**
|
/**
|
||||||
* @author steven
|
* @author steven
|
||||||
*/
|
*/
|
||||||
public class UI extends JPanel {
|
public class HomePanel extends JPanel {
|
||||||
private final UIManager uim;
|
private static final Logger LOGGER = new Logger(HomePanel.class);
|
||||||
|
|
||||||
public UI(UIManager uim) {
|
public HomePanel() {
|
||||||
initComponents();
|
initComponents();
|
||||||
createTunnelsUI(WireGuardHandler.getTunnelConfigs());
|
createTunnelsUI(WireGuardHandler.getTunnelConfigs());
|
||||||
this.uim = uim;
|
|
||||||
updateActiveTunnels();
|
updateActiveTunnels();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,7 +100,7 @@ public class UI extends JPanel {
|
|||||||
String tunnelConfig = Files.readString(Path.of(Utils.APP_DIR + "/" + getSelectedTunnel() + ".conf"));
|
String tunnelConfig = Files.readString(Path.of(Utils.APP_DIR + "/" + getSelectedTunnel() + ".conf"));
|
||||||
configArea.setText(tunnelConfig);
|
configArea.setText(tunnelConfig);
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
ex.printStackTrace();
|
LOGGER.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -111,7 +110,7 @@ public class UI extends JPanel {
|
|||||||
String tunnelConfig = Files.readString(Path.of(Utils.APP_DIR + "/" + getSelectedTunnel() + ".conf"));
|
String tunnelConfig = Files.readString(Path.of(Utils.APP_DIR + "/" + getSelectedTunnel() + ".conf"));
|
||||||
configArea.setText(tunnelConfig);
|
configArea.setText(tunnelConfig);
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
ex.printStackTrace();
|
LOGGER.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
loadTunnel(originalTunnel);
|
loadTunnel(originalTunnel);
|
||||||
}
|
}
|
||||||
@ -133,11 +132,19 @@ public class UI extends JPanel {
|
|||||||
try {
|
try {
|
||||||
WireGuardHandler.loadTunnel(Path.of(f.getAbsolutePath()));
|
WireGuardHandler.loadTunnel(Path.of(f.getAbsolutePath()));
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
ex.printStackTrace();
|
LOGGER.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
listModel.addElement("◦ " + f.getName().replace(".conf", ""));
|
listModel.addElement("◦ " + f.getName().replace(".conf", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void exceptionBtn(ActionEvent e) {
|
||||||
|
try {
|
||||||
|
Utils.throwException();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
LOGGER.error(ex.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @formatter:off
|
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @formatter:off
|
||||||
tunnelsLabel = new JLabel();
|
tunnelsLabel = new JLabel();
|
||||||
@ -151,6 +158,7 @@ public class UI extends JPanel {
|
|||||||
showConfigBtn = new JButton();
|
showConfigBtn = new JButton();
|
||||||
importBtn = new JButton();
|
importBtn = new JButton();
|
||||||
startTunnelBtn = new JButton();
|
startTunnelBtn = new JButton();
|
||||||
|
exceptionBtn = new JButton();
|
||||||
stopTunnelBtn = new JButton();
|
stopTunnelBtn = new JButton();
|
||||||
|
|
||||||
//======== this ========
|
//======== this ========
|
||||||
@ -214,6 +222,11 @@ public class UI extends JPanel {
|
|||||||
startTunnelBtn.addActionListener(e -> loadBtn(e));
|
startTunnelBtn.addActionListener(e -> loadBtn(e));
|
||||||
add(startTunnelBtn, "cell 0 10 2 1");
|
add(startTunnelBtn, "cell 0 10 2 1");
|
||||||
|
|
||||||
|
//---- exceptionBtn ----
|
||||||
|
exceptionBtn.setText("Exceptional");
|
||||||
|
exceptionBtn.addActionListener(e -> exceptionBtn(e));
|
||||||
|
add(exceptionBtn, "cell 3 10");
|
||||||
|
|
||||||
//---- stopTunnelBtn ----
|
//---- stopTunnelBtn ----
|
||||||
stopTunnelBtn.setText("Stop Tunnel");
|
stopTunnelBtn.setText("Stop Tunnel");
|
||||||
stopTunnelBtn.addActionListener(e -> stopTunnelBtn(e));
|
stopTunnelBtn.addActionListener(e -> stopTunnelBtn(e));
|
||||||
@ -232,6 +245,7 @@ public class UI extends JPanel {
|
|||||||
private JButton showConfigBtn;
|
private JButton showConfigBtn;
|
||||||
private JButton importBtn;
|
private JButton importBtn;
|
||||||
private JButton startTunnelBtn;
|
private JButton startTunnelBtn;
|
||||||
|
private JButton exceptionBtn;
|
||||||
private JButton stopTunnelBtn;
|
private JButton stopTunnelBtn;
|
||||||
// JFormDesigner - End of variables declaration //GEN-END:variables @formatter:on
|
// JFormDesigner - End of variables declaration //GEN-END:variables @formatter:on
|
||||||
|
|
@ -69,6 +69,13 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 10 2 1"
|
"value": "cell 0 10 2 1"
|
||||||
} )
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "exceptionBtn"
|
||||||
|
"text": "Exceptional"
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "exceptionBtn", true ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 3 10"
|
||||||
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "stopTunnelBtn"
|
name: "stopTunnelBtn"
|
||||||
"text": "Stop Tunnel"
|
"text": "Stop Tunnel"
|
@ -8,6 +8,7 @@ import java.awt.*;
|
|||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import net.miginfocom.swing.*;
|
import net.miginfocom.swing.*;
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
import tech.nevets.tvpn.auth.AuthManager;
|
import tech.nevets.tvpn.auth.AuthManager;
|
||||||
import tech.nevets.tvpn.auth.UserToken;
|
import tech.nevets.tvpn.auth.UserToken;
|
||||||
|
|
||||||
@ -15,6 +16,7 @@ import tech.nevets.tvpn.auth.UserToken;
|
|||||||
* @author steven
|
* @author steven
|
||||||
*/
|
*/
|
||||||
public class LoginPanel extends JPanel {
|
public class LoginPanel extends JPanel {
|
||||||
|
private static final Logger LOGGER = new Logger(LoginPanel.class);
|
||||||
private final UIManager uim;
|
private final UIManager uim;
|
||||||
|
|
||||||
public LoginPanel(UIManager uim) {
|
public LoginPanel(UIManager uim) {
|
||||||
@ -40,7 +42,7 @@ public class LoginPanel extends JPanel {
|
|||||||
statusLabel.setText("Unable to authenticate with stored token, please login");
|
statusLabel.setText("Unable to authenticate with stored token, please login");
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
LOGGER.error(ex.getMessage());
|
||||||
statusLabel.setText("An error occurred during login.");
|
statusLabel.setText("An error occurred during login.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -79,7 +81,7 @@ public class LoginPanel extends JPanel {
|
|||||||
uim.getUIPanel().updateUserInfo(token.getUsername(), token.getEmail());
|
uim.getUIPanel().updateUserInfo(token.getUsername(), token.getEmail());
|
||||||
uim.disposeLoginFrame();
|
uim.disposeLoginFrame();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
LOGGER.error(ex.getMessage());
|
||||||
statusLabel.setText("An error occurred during login.");
|
statusLabel.setText("An error occurred during login.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
51
src/main/java/tech/nevets/tvpn/ui/LogsPanel.java
Normal file
51
src/main/java/tech/nevets/tvpn/ui/LogsPanel.java
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* Created by JFormDesigner on Thu Oct 17 14:11:06 EDT 2024
|
||||||
|
*/
|
||||||
|
|
||||||
|
package tech.nevets.tvpn.ui;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import net.miginfocom.swing.*;
|
||||||
|
import tech.nevets.tvpn.LogOutputStream;
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
|
import tech.nevets.tvpn.Utils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author steven
|
||||||
|
*/
|
||||||
|
public class LogsPanel extends JPanel {
|
||||||
|
|
||||||
|
public LogsPanel(LogOutputStream logOut) {
|
||||||
|
initComponents();
|
||||||
|
logOut.initLogTab(logsArea);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initComponents() {
|
||||||
|
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @formatter:off
|
||||||
|
logsScroll = new JScrollPane();
|
||||||
|
logsArea = new JTextArea();
|
||||||
|
|
||||||
|
//======== this ========
|
||||||
|
setLayout(new MigLayout(
|
||||||
|
"hidemode 3",
|
||||||
|
// columns
|
||||||
|
"[grow,fill]",
|
||||||
|
// rows
|
||||||
|
"[grow]"));
|
||||||
|
|
||||||
|
//======== logsScroll ========
|
||||||
|
{
|
||||||
|
|
||||||
|
//---- logsArea ----
|
||||||
|
logsArea.setEditable(false);
|
||||||
|
logsScroll.setViewportView(logsArea);
|
||||||
|
}
|
||||||
|
add(logsScroll, "cell 0 0,grow");
|
||||||
|
// JFormDesigner - End of component initialization //GEN-END:initComponents @formatter:on
|
||||||
|
}
|
||||||
|
|
||||||
|
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables @formatter:off
|
||||||
|
private JScrollPane logsScroll;
|
||||||
|
private JTextArea logsArea;
|
||||||
|
// JFormDesigner - End of variables declaration //GEN-END:variables @formatter:on
|
||||||
|
}
|
26
src/main/java/tech/nevets/tvpn/ui/LogsPanel.jfd
Normal file
26
src/main/java/tech/nevets/tvpn/ui/LogsPanel.jfd
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
JFDML JFormDesigner: "8.2.4.0.393" Java: "17.0.9" encoding: "UTF-8"
|
||||||
|
|
||||||
|
new FormModel {
|
||||||
|
contentType: "form/swing"
|
||||||
|
root: new FormRoot {
|
||||||
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
|
"$layoutConstraints": "hidemode 3"
|
||||||
|
"$columnConstraints": "[grow,fill]"
|
||||||
|
"$rowConstraints": "[grow]"
|
||||||
|
} ) {
|
||||||
|
name: "this"
|
||||||
|
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
|
||||||
|
name: "logsScroll"
|
||||||
|
add( new FormComponent( "javax.swing.JTextArea" ) {
|
||||||
|
name: "logsArea"
|
||||||
|
"editable": false
|
||||||
|
} )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 0,grow"
|
||||||
|
} )
|
||||||
|
}, new FormLayoutConstraints( null ) {
|
||||||
|
"location": new java.awt.Point( 0, 0 )
|
||||||
|
"size": new java.awt.Dimension( 400, 300 )
|
||||||
|
} )
|
||||||
|
}
|
||||||
|
}
|
@ -1,21 +1,38 @@
|
|||||||
package tech.nevets.tvpn.ui;
|
package tech.nevets.tvpn.ui;
|
||||||
|
|
||||||
|
import tech.nevets.tvpn.LogOutputStream;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class UIManager {
|
public class UIManager {
|
||||||
private List<JPanel> panels = new ArrayList<>();
|
private final JFrame frame;
|
||||||
private JFrame loginFrame;
|
private final JTabbedPane tabPane;
|
||||||
private JFrame uiFrame;
|
|
||||||
private UI uiPanel;
|
|
||||||
|
|
||||||
|
private JFrame loginFrame;
|
||||||
|
private final HomePanel homePanel;
|
||||||
|
|
||||||
|
public UIManager(LogOutputStream logOut) {
|
||||||
|
frame = new JFrame();
|
||||||
|
tabPane = new JTabbedPane();
|
||||||
|
|
||||||
|
homePanel = new HomePanel();
|
||||||
|
tabPane.addTab("Home", homePanel);
|
||||||
|
tabPane.addTab("Logs", new LogsPanel(logOut));
|
||||||
|
|
||||||
|
frame.add(tabPane);
|
||||||
|
frame.pack();
|
||||||
|
frame.setSize(720, 480);
|
||||||
|
frame.setTitle("TVPN");
|
||||||
|
frame.setLocationRelativeTo(null);
|
||||||
|
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
|
SwingUtilities.updateComponentTreeUI(frame);
|
||||||
|
frame.setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
public void startLoginFrame() {
|
public void startLoginFrame() {
|
||||||
loginFrame = new JFrame();
|
loginFrame = new JFrame();
|
||||||
JPanel p = new LoginPanel(this);
|
JPanel p = new LoginPanel(this);
|
||||||
loginFrame.add(p);
|
loginFrame.add(p);
|
||||||
panels.add(p);
|
|
||||||
loginFrame.pack();
|
loginFrame.pack();
|
||||||
loginFrame.setTitle("Login");
|
loginFrame.setTitle("Login");
|
||||||
loginFrame.setSize(340, 170);
|
loginFrame.setSize(340, 170);
|
||||||
@ -29,31 +46,8 @@ public class UIManager {
|
|||||||
loginFrame.dispose();
|
loginFrame.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startUIFrame() {
|
protected HomePanel getUIPanel() {
|
||||||
uiFrame = new JFrame();
|
return homePanel;
|
||||||
uiPanel = new UI(this);
|
|
||||||
uiFrame.add(uiPanel);
|
|
||||||
panels.add(uiPanel);
|
|
||||||
uiFrame.pack();
|
|
||||||
uiFrame.setTitle("TVPN");
|
|
||||||
uiFrame.setSize(720, 480);
|
|
||||||
uiFrame.setLocationRelativeTo(null);
|
|
||||||
uiFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
||||||
uiFrame.setVisible(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected UI getUIPanel() {
|
|
||||||
return uiPanel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void startFileChooserFrame(JFileChooser fileChooser) {
|
|
||||||
JFrame f = new JFrame();
|
|
||||||
f.add(fileChooser);
|
|
||||||
f.pack();
|
|
||||||
f.setTitle("Choose WireGuard Config File");
|
|
||||||
f.setLocationRelativeTo(null);
|
|
||||||
f.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
|
||||||
f.setVisible(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
package tech.nevets.tvpn.wg;
|
|
||||||
|
|
||||||
import tech.nevets.tvpn.Utils;
|
|
||||||
|
|
||||||
import java.io.*;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
|
||||||
|
|
||||||
public class WGTesting {
|
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException, InterruptedException {
|
|
||||||
List<String> configs = listConfigs();
|
|
||||||
//String currentTunnel = getCurrentTunnel();
|
|
||||||
//System.out.println(currentTunnel);
|
|
||||||
//pullTunnelConfig(currentTunnel);
|
|
||||||
//WireGuardHandler.stopTunnel(currentTunnel);
|
|
||||||
Random r = ThreadLocalRandom.current();
|
|
||||||
int index = r.nextInt(configs.size());
|
|
||||||
System.out.println("Index: " + index);
|
|
||||||
System.out.println("Random Tunnel: " + configs.get(index).substring(0, configs.get(index).length() - 11));
|
|
||||||
//WireGuardHandler.startTunnel(configs.get(index).substring(0, configs.get(index).length() - 11));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getCurrentTunnel() throws IOException {
|
|
||||||
String[] rSplit = getWGShowLines();
|
|
||||||
for (String s : rSplit) {
|
|
||||||
if (s.toLowerCase().contains("interface")) {
|
|
||||||
return s.split(":")[1].trim();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<String> getCurrentTunnels() throws IOException {
|
|
||||||
String[] rSplit = getWGShowLines();
|
|
||||||
List<String> tunnels = new ArrayList<>();
|
|
||||||
for (String s : rSplit) {
|
|
||||||
if (s.toLowerCase().contains("interface")) {
|
|
||||||
tunnels.add(s.split(":")[1].trim());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return tunnels;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String[] getWGShowLines() throws IOException {
|
|
||||||
ProcessBuilder pb = new ProcessBuilder();
|
|
||||||
pb.command("cmd", "/C", "wg.exe", "show");
|
|
||||||
Process p = pb.start();
|
|
||||||
String result = new String(p.getInputStream().readAllBytes());
|
|
||||||
return result.split("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void pullTunnelConfig(String tunnelName) throws IOException {
|
|
||||||
ProcessBuilder pb = new ProcessBuilder();
|
|
||||||
pb.redirectOutput(new File(Utils.APP_DIR + "/" + tunnelName + ".conf"));
|
|
||||||
pb.redirectError(ProcessBuilder.Redirect.INHERIT);
|
|
||||||
pb.command("cmd", "/C", "wg.exe", "showconf", tunnelName);
|
|
||||||
pb.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<String> listConfigs() throws IOException {
|
|
||||||
List<Path> filePaths = new ArrayList<>();
|
|
||||||
Path path = Path.of(Utils.WG_CONF_DIR);
|
|
||||||
Files.walk(path)
|
|
||||||
.filter(Files::isRegularFile)
|
|
||||||
.forEach(filePaths::add);
|
|
||||||
List<String> fileNames = new ArrayList<>();
|
|
||||||
for(Path p : filePaths) {
|
|
||||||
String fullPath = p.toString();
|
|
||||||
fileNames.add(fullPath.substring(fullPath.lastIndexOf("\\") + 1));
|
|
||||||
}
|
|
||||||
return fileNames;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,5 +1,6 @@
|
|||||||
package tech.nevets.tvpn.wg;
|
package tech.nevets.tvpn.wg;
|
||||||
|
|
||||||
|
import tech.nevets.tvpn.Logger;
|
||||||
import tech.nevets.tvpn.Utils;
|
import tech.nevets.tvpn.Utils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -13,6 +14,7 @@ import java.util.stream.Stream;
|
|||||||
import static tech.nevets.tvpn.Utils.*;
|
import static tech.nevets.tvpn.Utils.*;
|
||||||
|
|
||||||
public class WireGuardHandler {
|
public class WireGuardHandler {
|
||||||
|
private static final Logger LOGGER = new Logger(WireGuardHandler.class);
|
||||||
|
|
||||||
public static void loadTunnel(Path tunnelConfig) throws IOException {
|
public static void loadTunnel(Path tunnelConfig) throws IOException {
|
||||||
Files.copy(tunnelConfig, Path.of(WG_CONF_DIR + tunnelConfig.getFileName().toString()));
|
Files.copy(tunnelConfig, Path.of(WG_CONF_DIR + tunnelConfig.getFileName().toString()));
|
||||||
@ -43,7 +45,7 @@ public class WireGuardHandler {
|
|||||||
}
|
}
|
||||||
System.out.println("Tunnel Started");
|
System.out.println("Tunnel Started");
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,7 +69,7 @@ public class WireGuardHandler {
|
|||||||
}
|
}
|
||||||
System.out.println("Tunnel Stopped");
|
System.out.println("Tunnel Stopped");
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,7 +86,7 @@ public class WireGuardHandler {
|
|||||||
}
|
}
|
||||||
return fileNames;
|
return fileNames;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -107,7 +109,7 @@ public class WireGuardHandler {
|
|||||||
Process p = pb.start();
|
Process p = pb.start();
|
||||||
return new String(p.getInputStream().readAllBytes());
|
return new String(p.getInputStream().readAllBytes());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -132,7 +134,7 @@ public class WireGuardHandler {
|
|||||||
Process p = pb.start();
|
Process p = pb.start();
|
||||||
p.waitFor();
|
p.waitFor();
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
e.printStackTrace();
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
29
src/main/java/tech/nevets/tvpn/wg/WireGuardJNI.java
Normal file
29
src/main/java/tech/nevets/tvpn/wg/WireGuardJNI.java
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
package tech.nevets.tvpn.wg;
|
||||||
|
|
||||||
|
public class WireGuardJNI {
|
||||||
|
// Load the native library
|
||||||
|
static {
|
||||||
|
System.loadLibrary("libwireguard_wrapper"); // This will load wireguard_wrapper.dll (or .so on Linux)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Native method declaration
|
||||||
|
public native int installAdapter();
|
||||||
|
public native int removeAdapter();
|
||||||
|
|
||||||
|
public native int startTunnel(String tunnelName);
|
||||||
|
public native int stopTunnel(String tunnelName);
|
||||||
|
public native int createTunnel(String tunnelName);
|
||||||
|
public native int deleteTunnel(String tunnelName);
|
||||||
|
|
||||||
|
public native String getConfig(String tunnelName);
|
||||||
|
public native int updateConfig(String tunnelName, String newConfig);
|
||||||
|
public native int addConfig(String tunnelName, String config);
|
||||||
|
|
||||||
|
public native String getActiveTunnel();
|
||||||
|
public native boolean isActive();
|
||||||
|
|
||||||
|
public native int initializeWireGuard(String configFilePath);
|
||||||
|
public native void cleanup();
|
||||||
|
|
||||||
|
// Other methods for WireGuard interaction can be added here if needed
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user