Commit fed8cdcf authored by chickahoona's avatar chickahoona

sanso to psono

parent f7362da0
FROM ubuntu:14.04
ENV DEBIAN_FRONTEND noninteractive
MAINTAINER Sascha Pfeiffer <saschapfeiffer@sanso.pw>
MAINTAINER Sascha Pfeiffer <saschapfeiffer@psono.com>
COPY . /root/
WORKDIR /root
RUN apt-get update && \
......
......@@ -6,9 +6,9 @@ https://developer.mozilla.org/en-US/Add-ons/SDK/Tutorials
1. Download the crx file here:
https://browserplugins.chickahoona.com/dist/chrome/sanso.PW.crx
https://browserplugins.chickahoona.com/dist/chrome/psono.PW.crx
2. Rename ***sanso.PW.crx*** to ***something.zip***
2. Rename ***psono.PW.crx*** to ***something.zip***
3. Unpack ***something.zip*** into a folder of your choice ***"folder/of/your/choice"***
......@@ -25,7 +25,7 @@ The extension should now be loaded
1. Click on the following link:
https://browserplugins.chickahoona.com/dist/firefox/sanso.PW.xpi
https://browserplugins.chickahoona.com/dist/firefox/psono.PW.xpi
(You will be asked (at the top left) if you want to allow this extension to be installed which you have to permit)
......@@ -54,7 +54,7 @@ The extension should now be loaded
(make sure to run gulp without parameter first)
After this command you will find in ./dist/chrome/sanso.PW.crx (and ./dist/chrome/sanso.PW.update.xml)
After this command you will find in ./dist/chrome/psono.PW.crx (and ./dist/chrome/psono.PW.update.xml)
4. Pack Firefox extension for release
......@@ -62,14 +62,14 @@ The extension should now be loaded
(make sure to run gulp without parameter first)
After this command you will find ./dist/firefox/sanso.PW.xpi (and the unsigned version
./dist/firefox/sanso.PW.unsigned.xpi)
After this command you will find ./dist/firefox/psono.PW.xpi (and the unsigned version
./dist/firefox/psono.PW.unsigned.xpi)
If you do not want to create an official signed version and only want to create the unsigned version you can do:
gulp xpiunsigned
Only ./dist/firefox/sanso.PW.unsigned.xpi will be created.
Only ./dist/firefox/psono.PW.unsigned.xpi will be created.
5. (optional) Pack chrome and firefox for release
......
......@@ -92,7 +92,7 @@ gulp.task('crx', function() {
var manifest = require('./build/chrome/manifest.json');
var codebase = manifest.codebase;
var updateXmlFilename = 'sanso.PW.update.xml';
var updateXmlFilename = 'psono.PW.update.xml';
return gulp.src('./build/chrome')
......@@ -110,8 +110,8 @@ gulp.task('crx', function() {
*/
gulp.task('xpiunsigned', function (cb) {
//child_process.exec('cd build/firefox/ && jpm xpi && cd ../../ && mv build/firefox/@sansopw-*.xpi dist/firefox/ && cd dist/firefox/ && for file in @*; do mv $file `echo $file | cut -c2-`; done && cd ../../', function (err, stdout, stderr) {
child_process.exec('cd build/firefox/ && jpm xpi && cd ../../ && mv build/firefox/@sansopw-*.xpi dist/firefox/sanso.PW.unsigned.xpi', function (err, stdout, stderr) {
//child_process.exec('cd build/firefox/ && jpm xpi && cd ../../ && mv build/firefox/@psonopw-*.xpi dist/firefox/ && cd dist/firefox/ && for file in @*; do mv $file `echo $file | cut -c2-`; done && cd ../../', function (err, stdout, stderr) {
child_process.exec('cd build/firefox/ && jpm xpi && cd ../../ && mv build/firefox/@psonopw-*.xpi dist/firefox/psono.PW.unsigned.xpi', function (err, stdout, stderr) {
console.log(stdout);
console.log(stderr);
cb(err);
......@@ -144,7 +144,7 @@ gulp.task('xpi', ['xpiunsigned'], function (cb) {
var key = require(path.homedir() + '/.password_manager_browser_plugins/apikey_addons_mozilla_org/key.json');
child_process.exec('jpm sign --api-key '+key.issuer+' --api-secret '+key.secret+' --xpi dist/firefox/sanso.PW.unsigned.xpi && mv sansopw*.xpi dist/firefox/sanso.PW.xpi', function (err, stdout, stderr) {
child_process.exec('jpm sign --api-key '+key.issuer+' --api-secret '+key.secret+' --xpi dist/firefox/psono.PW.unsigned.xpi && mv psonopw*.xpi dist/firefox/psono.PW.xpi', function (err, stdout, stderr) {
console.log(stdout);
console.log(stderr);
cb(err);
......
{
"manifest_version": 2,
"name": "sanso.PW",
"description": "Sanso Password Manager",
"name": "psono.PW",
"description": "Psono Password Manager",
"version": "1.0",
"update_url": "https://browserplugins.chickahoona.com/dist/chrome/sanso.PW.update.xml",
"update_url": "https://browserplugins.chickahoona.com/dist/chrome/psono.PW.update.xml",
"browser_action": {
"default_icon": "data/img/icon-32.png",
......
This diff is collapsed.
......@@ -77,9 +77,9 @@
</ul>
<h2>More</h2>
<ul class="navigations">
<li><a href="https://www.sanso.pw/premium">Get Premium</a></li>
<li><a href="https://www.sanso.pw/help" target="_blank">Help</a></li>
<li><a href="https://www.sanso.pw/about" target="_blank">About</a></li>
<li><a href="https://www.psono.pw/premium">Get Premium</a></li>
<li><a href="https://www.psono.pw/help" target="_blank">Help</a></li>
<li><a href="https://www.psono.pw/about" target="_blank">About</a></li>
</ul>
</div>
......
src/common/data/img/logo-inverse.png

4.67 KB | W: | H:

src/common/data/img/logo-inverse.png

2.63 KB | W: | H:

src/common/data/img/logo-inverse.png
src/common/data/img/logo-inverse.png
src/common/data/img/logo-inverse.png
src/common/data/img/logo-inverse.png
  • 2-up
  • Swipe
  • Onion skin
src/common/data/img/logo.png

4.66 KB | W: | H:

src/common/data/img/logo.png

2.58 KB | W: | H:

src/common/data/img/logo.png
src/common/data/img/logo.png
src/common/data/img/logo.png
src/common/data/img/logo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -101,7 +101,7 @@
if (getDistance(evt) < 30) {
var dropcontent = '';
dropcontent += '<div class="sanso-pw-drop-content-inner">';
dropcontent += '<div class="psono-pw-drop-content-inner">';
dropcontent += '<ul class="navigations">';
dropcontent += '<li><a href="#">Open Datastore</a></li>';
for (var i = 0; i < website_passwords.length; i++) {
......@@ -115,7 +115,7 @@
var dropInstance = new Drop({
target: evt.target,
content: dropcontent,
classes: 'sanso-pw-drop-theme-arrows yui3-cssreset',
classes: 'psono-pw-drop-theme-arrows yui3-cssreset',
position: 'bottom left',
openOn: null
});
......@@ -125,7 +125,7 @@
setTimeout(function(){
$( ".sanso-pw-drop-content-inner .request-secret" ).on( "click", function() {
$( ".psono-pw-drop-content-inner .request-secret" ).on( "click", function() {
requestSecret($(this).attr('data-secret-id'));
});
$(window).one("click", close);
......
......@@ -112,7 +112,7 @@ function createContext() {
});
var defaultOptions = {
classPrefix: 'sanso-pw-drop',
classPrefix: 'psono-pw-drop',
defaults: {
position: 'bottom left',
openOn: 'click',
......
......@@ -7,13 +7,13 @@
'angular-complexify', 'datatables'])
.constant('BACKEND_SERVERS', [
{
title: 'Sanso.pw', url: 'https://www.sanso.pw'
title: 'Psono.pw', url: 'https://www.psono.pw'
},
{
title: 'Dev Sanso.pw', url: 'https://dev.sanso.pw'
title: 'Dev Psono.pw', url: 'https://dev.psono.pw'
},
{
title: 'Dev2 Sanso.pw', url: 'http://dev.sanso.pw:8001'
title: 'Dev2 Psono.pw', url: 'http://dev.psono.pw:8001'
}
]);
......
......@@ -8,18 +8,41 @@
*
* @param datastore
* @param path
* @param data
* @param content
*/
var update_paths_with_data = function(datastore, path, data) {
var update_paths_with_data = function(datastore, path, content) {
var i, l;
var path_copy = path.slice();
var search = find_in_datastore(path_copy, datastore);
var obj = search[0][search[1]];
for (var prop in data) {
if (!data.hasOwnProperty(prop)) {
console.log("update_paths_with_data");
console.log(obj);
obj['share_rights'] = {
'read': false,
'write': false,
'grant': false
};
if (content.user_share_rights.length > 0) {
for (i = 0, l = content.user_share_rights.length; i < l; i++) {
obj['share_rights']['read'] = obj['share_rights']['read'] ||content.user_share_rights[i].read;
obj['share_rights']['write'] = obj['share_rights']['write'] || content.user_share_rights[i].write;
obj['share_rights']['grant'] = obj['share_rights']['grant'] ||content.user_share_rights[i].grant;
}
} else {
for (i = 0, l = content.user_share_rights_inherited.length; i < l; i++) {
obj['share_rights']['read'] = obj['share_rights']['read'] ||content.user_share_rights_inherited[i].read;
obj['share_rights']['write'] = obj['share_rights']['write'] || content.user_share_rights_inherited[i].write;
obj['share_rights']['grant'] = obj['share_rights']['grant'] ||content.user_share_rights_inherited[i].grant;
}
}
for (var prop in content.data) {
if (!content.data.hasOwnProperty(prop)) {
continue;
}
obj[prop] = data[prop];
obj[prop] = content.data[prop];
}
};
......@@ -63,12 +86,12 @@
}
all_calls.push((function (share_id, sub_datastore, path) {
var onSuccess = function (data) {
all_share_data[share_id] = data;
var onSuccess = function (content) {
all_share_data[share_id] = content;
update_paths_with_data(datastore, path, data);
update_paths_with_data(datastore, path, content);
read_shares_recursive(sub_datastore, share_rights_dict, data.share_index, all_share_data);
read_shares_recursive(sub_datastore, share_rights_dict, content.data.share_index, all_share_data);
open_calls--;
};
......@@ -240,6 +263,7 @@
delete duplicate.share_id;
delete duplicate.secret_key;
delete duplicate.share_rights;
managerShare.write_share(share_id, duplicate, secret_key);
}
......
......@@ -18,7 +18,11 @@
};
var onSuccess = function(content) {
return JSON.parse(cryptoLibrary.decrypt_data(content.data.data, content.data.data_nonce, secret_key));
return {
data: JSON.parse(cryptoLibrary.decrypt_data(content.data.data, content.data.data_nonce, secret_key)),
user_share_rights: content.data.user_share_rights,
user_share_rights_inherited: content.data.user_share_rights_inherited
};
};
return apiClient.read_share(managerBase.find_one_nolimit('config', 'user_token'), share_id)
......
......@@ -47,7 +47,7 @@
<ul class="navigations" ng-if="!datastore.search">
<li><a href="#" ng-click="openTab('/data/datastore.html')">Open Datastore</a></li>
<li><a href="#" ng-click="generatePassword()">Generate Password</a></li>
<li><a href="https://www.sanso.pw/help" target="_blank">Help</a></li>
<li><a href="https://www.psono.pw/help" target="_blank">Help</a></li>
</ul>
......
@import "variables";
.sanso-pw-drop {
.psono-pw-drop {
z-index:1000;
}
.sanso-pw-drop-element,
.sanso-pw-drop-element:after,
.sanso-pw-drop-element:before,
.sanso-pw-drop-element *,
.sanso-pw-drop-element *:after,
.sanso-pw-drop-element *:before {
.psono-pw-drop-element,
.psono-pw-drop-element:after,
.psono-pw-drop-element:before,
.psono-pw-drop-element *,
.psono-pw-drop-element *:after,
.psono-pw-drop-element *:before {
box-sizing: border-box;
}
.sanso-pw-drop-element {
.psono-pw-drop-element {
position: absolute;
display: none;
}
.sanso-pw-drop-element.sanso-pw-drop-open {
.psono-pw-drop-element.psono-pw-drop-open {
display: block;
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows {
.psono-pw-drop-element.psono-pw-drop-theme-arrows {
max-width: 100%;
max-height: 100%;
.sanso-pw-drop-content {
.psono-pw-drop-content {
border-radius: 2px;
position: relative;
background: #FFF;
......@@ -40,7 +40,7 @@
}
}
.sanso-pw-drop-content .sanso-pw-drop-content-inner{
.psono-pw-drop-content .psono-pw-drop-content-inner{
background-color: $dark-color;
border: 1px solid #cdd2df;
font-family: 'Open Sans', sans-serif;
......@@ -49,7 +49,7 @@
padding: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
content: "";
display: block;
position: absolute;
......@@ -63,11 +63,11 @@
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-bottom.sanso-pw-drop-element-attached-center {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-bottom.psono-pw-drop-element-attached-center {
.psono-pw-drop-content {
margin-bottom: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
top: 100%;
left: 50%;
margin-left: -10px;
......@@ -75,11 +75,11 @@
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-top.sanso-pw-drop-element-attached-center {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-top.psono-pw-drop-element-attached-center {
.psono-pw-drop-content {
margin-top: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
bottom: 100%;
left: 50%;
margin-left: -10px;
......@@ -87,11 +87,11 @@
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-right.sanso-pw-drop-element-attached-middle {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-right.psono-pw-drop-element-attached-middle {
.psono-pw-drop-content {
margin-right: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
left: 100%;
top: 50%;
margin-top: -10px;
......@@ -99,11 +99,11 @@
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-left.sanso-pw-drop-element-attached-middle {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-left.psono-pw-drop-element-attached-middle {
.psono-pw-drop-content {
margin-left: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
right: 100%;
top: 50%;
margin-top: -10px;
......@@ -111,11 +111,11 @@
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-top.sanso-pw-drop-element-attached-left.sanso-pw-drop-target-attached-bottom {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-top.psono-pw-drop-element-attached-left.psono-pw-drop-target-attached-bottom {
.psono-pw-drop-content {
margin-top: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
bottom: 100%;
left: 10px;
border-bottom-color: #FFF;
......@@ -123,77 +123,77 @@
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-top.sanso-pw-drop-element-attached-right.sanso-pw-drop-target-attached-bottom {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-top.psono-pw-drop-element-attached-right.psono-pw-drop-target-attached-bottom {
.psono-pw-drop-content {
margin-top: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
bottom: 100%;
right: 10px;
border-bottom-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-bottom.sanso-pw-drop-element-attached-left.sanso-pw-drop-target-attached-top {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-bottom.psono-pw-drop-element-attached-left.psono-pw-drop-target-attached-top {
.psono-pw-drop-content {
margin-bottom: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
top: 100%;
left: 10px;
border-top-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-bottom.sanso-pw-drop-element-attached-right.sanso-pw-drop-target-attached-top {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-bottom.psono-pw-drop-element-attached-right.psono-pw-drop-target-attached-top {
.psono-pw-drop-content {
margin-bottom: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
top: 100%;
right: 10px;
border-top-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-top.sanso-pw-drop-element-attached-right.sanso-pw-drop-target-attached-left {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-top.psono-pw-drop-element-attached-right.psono-pw-drop-target-attached-left {
.psono-pw-drop-content {
margin-right: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
top: 10px;
left: 100%;
border-left-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-top.sanso-pw-drop-element-attached-left.sanso-pw-drop-target-attached-right {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-top.psono-pw-drop-element-attached-left.psono-pw-drop-target-attached-right {
.psono-pw-drop-content {
margin-left: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
top: 10px;
right: 100%;
border-right-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-bottom.sanso-pw-drop-element-attached-right.sanso-pw-drop-target-attached-left {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-bottom.psono-pw-drop-element-attached-right.psono-pw-drop-target-attached-left {
.psono-pw-drop-content {
margin-right: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
bottom: 10px;
left: 100%;
border-left-color: #FFF;
}
}
.sanso-pw-drop-element.sanso-pw-drop-theme-arrows.sanso-pw-drop-element-attached-bottom.sanso-pw-drop-element-attached-left.sanso-pw-drop-target-attached-right {
.sanso-pw-drop-content {
.psono-pw-drop-element.psono-pw-drop-theme-arrows.psono-pw-drop-element-attached-bottom.psono-pw-drop-element-attached-left.psono-pw-drop-target-attached-right {
.psono-pw-drop-content {
margin-left: 10px;
}
.sanso-pw-drop-content:before {
.psono-pw-drop-content:before {
bottom: 10px;
right: 100%;
border-right-color: #FFF;
......@@ -201,7 +201,7 @@
}
.sanso-pw-drop-element .navigations {
.psono-pw-drop-element .navigations {
list-style-type: none;
padding: 0;
margin: 0;
......
#sanso.pw
Sanso Password Manager
\ No newline at end of file
#psono.pw
Psono Password Manager
\ No newline at end of file
......@@ -47,7 +47,7 @@
* @returns {string}
*/
var getBaseUrl = function() {
return "resource://sansopw/";
return "resource://psonopw/";
};
/**
......
......@@ -86,7 +86,7 @@ panel.port.on('resize', function (data) {
var openTab = function (data) {
var tab = {
url: "resource://sansopw" + data.url
url: "resource://psonopw" + data.url
};
tabs.open(tab);
......
{
"title": "sanso.pw",
"name": "sansopw",
"title": "psono.pw",
"name": "psonopw",
"version": "0.0.3",
"description": "Sanso Password Manager",
"description": "Psono Password Manager",
"main": "index.js",
"author": "Sascha Pfeiffer",
"engines": {
......@@ -11,6 +11,6 @@
},
"license": "Copyright Sascha Pfeiffer, All rights reserved",
"permissions": {
"cross-domain-content": ["https://dev.sanso.pw", "http://dev.sanso.pw:8001"]
"cross-domain-content": ["https://dev.psono.pw", "http://dev.psono.pw:8001"]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment