@@ -388,6 +426,44 @@ along with this program. If not, see .
and click on API access. Copy the Authentication URL and Token above.
+
.
+var fs = require('fs');
+var util = require('util');
+var url = require('url');
+
+/** @return http: --> http, https: --> https, null otherwise */
+function getProtocol(prefix) {
+ switch (prefix) {
+ case "http:": return require('http');
+ case "https:": return require('https');
+ }
+
+ return null;
+}
+/**
+ * Read the path (utf8), chop it to individual certificates
+ * @return {[String, ...]} An array with all the certificates
+ */
+function splitCA(CAPath) {
+ chain = fs.readFileSync(CAPath, 'utf8').split('\n')
+ ca = [];
+ for (i=0, cert=[]; i < chain.length; i++) {
+ cert.push(chain[i]);
+ line = chain[i];
+ if (line.match(/-END CERTIFICATE-/)) {
+ ca.push(cert.join('\n'));
+ cert = [];
+ }
+
+ }
+
+ return ca;
+}
+
+/**
+ * An HTTP(S) client to make requests to the cloud. An instance of this class
+ * should be used to make requests to a specific service e.g., Identity,
+ * Storage, Compute, etc.
+ *
+ * It provides RESTfull methods: get, head, post, put, delete, update
+ *
+ * @param {String} endpointURL - trailing / is removed automatically
+ * @param {String} token - modify it as a property e.g. client.token = "tkn"
+ * @param {String } CAPath - the path of the CA certificates bundle file
+ */
+var Client = function(endpointURL, token, CAPath) {
+ var _options = {host: null, headers: { }, };
+ var _url, _parser, _protocol, _token;
+
+ this.setURL = function(newURL) {
+ _url = newURL;
+ _parser = url.parse(newURL);
+ _options.host = _parser.host;
+ _protocol = getProtocol(_parser.protocol);
+ if (_protocol) _endpoint = _parser.pathname.replace(/\/$/, "");
+ else throw "Unknown URL protocol";
+ };
+ this.getURL = function() { return _url; };
+ this.equalsURL = function(URL) { return URL === _url; };
+
+ this.setToken = function(newToken) {
+ _token = newToken;
+ if (_token) util._extend(_options.headers, { 'X-Auth-Token': _token, });
+ else delete _options.headers['X-Auth-Token'];
+ };
+ this.getToken = function() { return _token; }
+
+ this.setCA = function(newCAPath) {
+ this.CAPath = newCAPath;
+ if (newCAPath) _options.ca = splitCA(newCAPath);
+ else delete _options.ca;
+ };
+ this.getCA = function() { return _options.ca; };
+
+ this.setURL(endpointURL);
+ this.setToken(token);
+ this.setCA(CAPath);
+
+ this.post = function(path, headers, send_data, status, handle_res, handle_err) {
+ handle_res = handle_res || function(r){ console.log(r); };
+ handle_err = handle_err || function(e){ console.log(e); };
+
+ var post_opts = util._extend({
+ method: 'POST',
+ path: _endpoint + path,
+ }, _options);
+ post_opts.headers = util._extend({}, _options.headers);
+
+ util._extend(post_opts.headers, headers);
+ if (send_data) {
+ h = post_opts.headers;
+ util._extend(post_opts.headers, {
+ 'Content-Type': h['Content-Type'] || 'application/json',
+ 'Content-Length': h['Content-Length'] || Buffer.byteLength(send_data),
+ });
+ };
+
+ _req = _protocol.request(post_opts, function(res){
+ _recv_data = '';
+ res.on('data', function(d) { _recv_data+=d; });
+
+ res.on('end', function() {
+ if ((status || 200) !== res.statusCode) {
+ handle_err(res.statusCode + " " + res.statusMessage, res.headers);
+ } else handle_res(_recv_data, res.headers);
+
+ });
+ });
+
+ if (send_data) _req.write(send_data);
+ _req.end();
+ _req.on('error', handle_err);
+ };
+
+};
+
+module.exports = { Client: Client };
+
+/**
+ * Test if client is working correctly.
+ */
+function testClient(token) {
+ var astakos = new Client(
+ "https://accounts.okeanos.grnet.gr/identity/v2.0",
+ token,
+ "/etc/ssl/certs/ca-certificates.crt"
+ );
+
+ data2send = { auth: { token: { id: token } } };
+
+ function print_user_name(data, headers) {
+ var jdata = JSON.parse(data);
+ console.log(jdata.access.user.name);
+ console.log(headers);
+ }
+
+ // astakos.post('/tokens', null, null, 200, function(m){console.log("Result: " + m)});
+ astakos.post('/tokens', null, JSON.stringify(data2send), 200, print_user_name);
+}
+
+// testClient("t0k3n");
diff --git a/baas/static/stylesheets/custom.css b/baas/static/stylesheets/custom.css
index f5ca8fd54eb68314d8e201b0a8069e73d38f3da1..a1b3af9181454a2a5f390857c04efa4f9a276d17 100644
--- a/baas/static/stylesheets/custom.css
+++ b/baas/static/stylesheets/custom.css
@@ -90,6 +90,7 @@ body legend, .template-list-title {
}
.dir-field {
overflow-x: auto;
+ word-break: break-word;
}
.template-list li a i {
visibility: hidden;
diff --git a/copy_cacert.py b/copy_cacert.py
new file mode 100644
index 0000000000000000000000000000000000000000..166255c51b2c5808215b7510370a01c22924d3b4
--- /dev/null
+++ b/copy_cacert.py
@@ -0,0 +1,13 @@
+import os
+import shutil
+
+def main():
+ os.chdir(os.path.dirname(os.path.realpath(__file__)))
+ os.system("pip install certifi")
+
+ print "Copying certifi's cacert.pem"
+ import certifi
+ shutil.copy2(certifi.where(), './cacert.pem')
+
+if __name__ == '__main__':
+ main()
diff --git a/make_package.sh b/make_package.sh
index 5febf50809916e96fc74f50065d19e1d3143fdbd..46b126ed5e8e6c3a3625104899ca2910b40df756 100755
--- a/make_package.sh
+++ b/make_package.sh
@@ -38,6 +38,7 @@ NW_VERSION=0.12.3
cd "$(dirname "$0")"
ROOTPATH=$(pwd)
+python copy_cacert.py
cd baas
npm install
cd ..
@@ -59,6 +60,7 @@ then RESOURCES=$DIST/baas.app/Contents/Resources
else RESOURCES=$DIST
fi
cp src/timeview.py $RESOURCES
+cp cacert.pem $RESOURCES
echo Copying duplicity
cp -r build/duplicity/* $RESOURCES