feature/embedded-server-config #1

krageon · 2019-08-03T18:58:57Z

krageon commented

2019-08-03 18:58:57 +00:00

You can now create a server config with all information embedded. If you have a local private key, the form will ask for you to input the file in a file box. You can elect to decrypt it as well. The decryption of private keys happens clientside.

If you entered the private key file in the file box, the private key does not get sent to the server - the reference is used to read the file and manipulate the server output until a valid server config exists.

You can now create a server config with all information embedded. If you have a local private key, the form will ask for you to input the file in a file box. You can elect to decrypt it as well. The decryption of private keys happens clientside. If you entered the private key file in the file box, the private key does not get sent to the server - the reference is used to read the file and manipulate the server output until a valid server config exists.

eater requested changes 2019-08-03 19:34:32 +00:00

public/js/pages/configBuilder.js

					
				@ -0,0 +33,4 @@

				    });

				    function handleZipResult(data) {

				        //var blob = new Blob(data, {type: 'application/zip'});

eater commented

2019-08-03 19:20:34 +00:00

commented code

krageon commented

2019-08-03 19:37:55 +00:00

fixed

public/js/pages/configBuilder.js

					
				@ -0,0 +71,4 @@

				        var keyEndOffset = match.index;

				        var keyContent = text.substring(keyStartOffset, keyEndOffset);

eater commented

2019-08-03 19:30:10 +00:00

/\<\s*key\s*\>[\s\n]*(((?!\<\/key\>).)+)[\s\n]*\<\s*\/\s*key\s*\>/gm.exec(text)[1]

```js /\<\s*key\s*\>[\s\n]*(((?!\<\/key\>).)+)[\s\n]*\<\s*\/\s*key\s*\>/gm.exec(text)[1] ```

krageon commented

2019-08-03 19:35:12 +00:00

No, I'll pass

views/etc/openvpn-client-embedded.conf.twig Outdated

					
				@ -0,0 +28,4 @@

				{{ cert }}</cert>

				<key>

				{{ key }}</key>

eater commented

2019-08-03 19:19:26 +00:00

please to end on next line

krageon commented

2019-08-03 19:35:47 +00:00

Keys have a return after them. This way it looks exactly as the end user expects when the template is filled. This is to my mind the superior option.

Keys have a return after them. This way it looks *exactly* as the end user expects when the template is filled. This is to my mind the superior option.

eater commented

2019-08-03 19:40:07 +00:00

I would rather have you use the following in that case

<key>
{{ key|trim }}
</key>

I would rather have you use the following in that case ```twig <key> {{ key|trim }} </key> ```

krageon commented

2019-08-03 19:42:14 +00:00

Good point, it's fixed

views/panel/config_builder.html.twig

					
				@ -25,1 +37,4 @@

				    </form>

				    <!-- TODO: Check data attribute to see if the cert is present -->

				    <!-- If cert is not on server, also ask for this -->

eater commented

2019-08-03 19:20:00 +00:00

🤔🤔🤔🤔🤔

krageon commented

2019-08-03 19:38:14 +00:00

Fixed

eater closed this pull request

2019-08-03 19:43:03 +00:00

krageon deleted branch feature/embedded-server-config

2019-08-03 19:49:46 +00:00

Sign in to join this conversation.

No reviewers

No labels

No milestone

No project

No assignees

2 participants

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: zer.ooo/web#1