zer.ooo
/
web
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Labels Milestones

feature/embedded-server-config #1

Manually merged
krageon merged 1 commits from krageon/zer.ooo-web:feature/embedded-server-config into master 5 years ago
Conversation 0 Commits 1 Files Changed 1
krageon commented 5 years ago
Collaborator

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 5 years ago
public/js/pages/configBuilder.js
@ -0,0 +33,4 @@
});
function handleZipResult(data) {
//var blob = new Blob(data, {type: 'application/zip'});
eater commented 5 years ago
Owner

commented code

commented code
krageon commented 5 years ago
Poster
Collaborator

fixed

fixed
public/js/pages/configBuilder.js
@ -0,0 +71,4 @@
var keyEndOffset = match.index;
var keyContent = text.substring(keyStartOffset, keyEndOffset);
eater commented 5 years ago
Owner 
/\<\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 5 years ago
Poster
Collaborator

No, I'll pass

No, I'll pass
views/etc/openvpn-client-embedded.conf.twig Outdated
@ -0,0 +28,4 @@
{{ cert }}</cert>
<key>
{{ key }}</key>
eater commented 5 years ago
Owner

please to end on next line

please to end on next line
krageon commented 5 years ago
Poster
Collaborator

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 5 years ago
Owner

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 5 years ago
Poster
Collaborator

Good point, it's fixed

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 5 years ago
Owner

🤔🤔🤔🤔🤔

🤔🤔🤔🤔🤔
krageon commented 5 years ago
Poster
Collaborator

Fixed

Fixed
eater closed this pull request 5 years ago
krageon deleted branch feature/embedded-server-config 5 years ago
The pull request has been manually merged as 4f773c0d2f.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b krageon-feature/embedded-server-config master
git pull feature/embedded-server-config

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff krageon-feature/embedded-server-config
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
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
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'krageon/zer.ooo-web:feature/embedded-server-config'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes