Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-14 16:14:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cert path fix

Browse Source
This commit is contained in:
SpikeHD
2022-05-29 21:14:31 -07:00
parent 95691d8c27
commit 6f5ed86f03
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/proxy.rs
View File

@@ -75,8 +75,8 @@ impl HttpHandler for ProxyHandler {
*/ */
pub async fn create_proxy(proxy_port: u16, certificate_path: String) { pub async fn create_proxy(proxy_port: u16, certificate_path: String) {
// Get the certificate and private key. // Get the certificate and private key.
let mut private_key_bytes: &[u8] = &fs::read(format!("{}/private.key", certificate_path)).expect("Could not read private key"); let mut private_key_bytes: &[u8] = &fs::read(format!("{}\\private.key", certificate_path)).expect("Could not read private key");
let mut ca_cert_bytes: &[u8] = &fs::read(format!("{}/cert.crt", certificate_path)).expect("Could not read certificate"); let mut ca_cert_bytes: &[u8] = &fs::read(format!("{}\\cert.crt", certificate_path)).expect("Could not read certificate");
// Parse the private key and certificate. // Parse the private key and certificate.
let private_key = rustls::PrivateKey( let private_key = rustls::PrivateKey(

2
src/ui/Test.tsx
View File

@@ -4,7 +4,7 @@ import {invoke} from '@tauri-apps/api/tauri'
import {dataDir} from '@tauri-apps/api/path' import {dataDir} from '@tauri-apps/api/path'
async function startProxy() { async function startProxy() {
await invoke('connect', { port: 2222, certificatePath: await dataDir() + '\\ca' }) await invoke('connect', { port: 2222, certificatePath: await dataDir() + '\\cultivation\\ca' })
} }
async function stopProxy() { async function stopProxy() {

2
src/ui/components/ServerLaunchSection.tsx
View File

@@ -106,7 +106,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
}) })
// Connect to proxy // Connect to proxy
await invoke('connect', { port: 8365, certificatePath: await dataDir() + '\\ca' }) await invoke('connect', { port: 8365, certificatePath: await dataDir() + '\\cultivation\\ca' })
} }
// Launch the program // Launch the program