aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/core/templates/pages
diff options
context:
space:
mode:
authorMarvin Borner2018-05-10 20:42:13 +0200
committerMarvin Borner2018-05-10 20:42:13 +0200
commita8d37fab30ccbced5ec8819510ee84893460bb5e (patch)
treed5983c82b866661c71d8683032ce303789847e29 /main/app/sprinkles/core/templates/pages
parentef6fc62a5048afd8467af20b34861ad085566481 (diff)
Began chat encrpytion integration and ECC key generation on registration
Diffstat (limited to 'main/app/sprinkles/core/templates/pages')
-rw-r--r--main/app/sprinkles/core/templates/pages/index.html.twig2
-rw-r--r--main/app/sprinkles/core/templates/pages/test.html.twig53
2 files changed, 53 insertions, 2 deletions
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index 59ad41e..ca38372 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -23,7 +23,7 @@
</div>
<div class="MainInTab FeedTabWindow">
{% for FeedImage in FeedImages %}
- <img class="FeedImage" src="{{ site.uri.public }}/image/{{ FeedImage.PostID }}" alt="An image">
+ <img class="FeedImage" src="{{ site.uri.public }}/image/{{ FeedImage.PostID }}" alt="You probably don't have an permission to see this image.">
<br>
{% endfor %}
</div>
diff --git a/main/app/sprinkles/core/templates/pages/test.html.twig b/main/app/sprinkles/core/templates/pages/test.html.twig
index 796ee72..972e734 100644
--- a/main/app/sprinkles/core/templates/pages/test.html.twig
+++ b/main/app/sprinkles/core/templates/pages/test.html.twig
@@ -5,4 +5,55 @@
<input formenctype="multipart/form-data" type="file" name="image"/>
</p>
<input formenctype="multipart/form-data" type="submit"/>
-</form> \ No newline at end of file
+</form>
+
+<form method="post" action="{{ site.uri.public }}/api/users/u/marvinborner/publickey">
+ {% include "forms/csrf.html.twig" %}
+ <p>
+ <input type="text" name="PublicKey"/>
+ </p>
+ <input type="submit"/>
+</form>
+
+<script>
+ var current_user_id = {{ current_user.id }};
+ {% include "pages/partials/config.js.twig" %}
+</script>
+
+{{ assets.js('js/main') | raw }}
+<script src="{{ assets.url('assets://SiteAssets/js/encryption.js') }}"></script>
+
+
+<script>
+
+ // GENERATE KEYS
+ var openpgp = window.openpgp;
+ var options;
+ var randomString = Math.random().toString(36).substr(2, 11); // PRIVKEY ENCRYPTION KEY
+ openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
+ options = {
+ userIds: [{name: 'marvinborner', email: 'marvin@borners.de'}],
+ curve: "curve25519",
+ passphrase: randomString
+ };
+ openpgp.generateKey(options).then(function (key) {
+ localStorage.setItem("PrivateKey", key.privateKeyArmored);
+ localStorage.setItem("🔒", randomString);
+ // SAVE PUBLIC KEY TO DATABASE
+ var data = {
+ csrf_name: site.csrf.name,
+ csrf_value: site.csrf.value,
+ PublicKey: key.publicKeyArmored
+ };
+ $.ajax({
+ type: 'POST',
+ url: site.uri.public + '/api/users/u/' + 'tory.redstart' + '/publickey',
+ data: data,
+ success: function (response) {
+ console.log(response);
+ //window.location.reload();
+ }
+ });
+
+ });
+</script> \ No newline at end of file