authentication-provider instance-store does not require role name argument

* NEWS: Update.
* doc/eclat.conf.5: Update.
* lib/Makefile.am: Add new sources.
* lib/istore.c: New file.
* lib/path.c: New file.
* lib/libeclat.h (path_concat)
(instance_store_curl_new)
(instance_store_read): New protos.
* src/config.c (cb_authentication_provider): second argument is
optional for instance-store type.
New compound statement: instance-store.
* src/eclat.h (instance_store_base_url)
(instance_store_port,instance_store_document_path):
(instance_store_credentials_path): New externs.
* src/ispeek.c: Rewrite using new functions.
* src/util.c: Likewise.

4 files changed, 116 insertions, 0 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 445d949..5b47328 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -42,6 +42,7 @@ libeclat_a_SOURCES=\
  forlangrm.h\
  forlangrm.y\
  forlanlex.l\
+ istore.c\
  json.h\
  jsongrm.h\
  jsongrm.y\
@@ -52,6 +53,7 @@ libeclat_a_SOURCES=\
  hmac_sha256.c\
  libeclat.h\
  map.c\
+ path.c\
  q2url.c\
  qaddparm.c\
  qcreat.c\
diff --git a/lib/istore.c b/lib/istore.c
new file mode 100644
index 0000000..dea3a53
--- /dev/null
+++ b/lib/istore.c
@@ -0,0 +1,73 @@
+/* This file is part of Eclat.
+   Copyright (C) 2012-2015 Sergey Poznyakoff.
+ 
+   Eclat is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+ 
+   Eclat is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include "libeclat.h"
+#include <sysexits.h>
+
+static size_t
+acc_cb(void *ptr, size_t size, size_t nmemb, void *data)
+{
+	size_t realsize = size * nmemb;
+	struct grecs_txtacc *acc = data;
+	grecs_txtacc_grow(acc, ptr, realsize);
+	return realsize;
+}
+
+CURL *
+instance_store_curl_new(struct grecs_txtacc *acc)
+{
+	CURLcode res;
+	CURL *curl;
+	
+	curl = curl_easy_init();
+	if (!curl)
+		die(EX_UNAVAILABLE, "curl_easy_init failed");
+	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, acc_cb);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, acc);
+	return curl;
+}
+
+int
+instance_store_read(const char *url, CURL *curl)
+{
+	CURLcode res;
+	long http_resp;
+	char *text;
+	
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+		
+	res = curl_easy_perform(curl);
+	if (res != CURLE_OK)
+		die(EX_UNAVAILABLE, "CURL: %s", curl_easy_strerror(res));
+
+	res = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_resp);
+	if (res != CURLE_OK)
+		die(EX_UNAVAILABLE, "CURL: %s", curl_easy_strerror(res));
+	
+	switch (http_resp) {
+	case 200:
+		break;
+
+	case 404:
+		return -1;
+
+	default:
+		die(EX_UNAVAILABLE, "CURL: got response %3d, url %s",
+		    http_resp, url);
+	}
+	return 0;
+}
diff --git a/lib/libeclat.h b/lib/libeclat.h
index 4d6882e..e13864c 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -55,6 +55,10 @@ int eclat_trace_fun(CURL *handle, curl_infotype type,
 		    char *data, size_t size,
 		    void *userp);
 void eclat_set_curl_trace(CURL *curl, int lev);
+
+char *path_concat(const char *dir, const char *comp);
+CURL *instance_store_curl_new(struct grecs_txtacc *acc);
+int instance_store_read(const char *url, CURL *curl);
 
 
 void hmac_sha1(const void *text, size_t textlen,
diff --git a/lib/path.c b/lib/path.c
new file mode 100644
index 0000000..69ea292
--- /dev/null
+++ b/lib/path.c
@@ -0,0 +1,37 @@
+/* This file is part of Eclat.
+   Copyright (C) 2012-2015 Sergey Poznyakoff.
+ 
+   Eclat is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+ 
+   Eclat is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include "libeclat.h"
+#include <string.h>
+
+char *
+path_concat(const char *dir, const char *comp)
+{
+	char *p;
+	size_t len = strlen(dir);
+
+	while (len > 0 && dir[len-1] == '/')
+		--len;
+
+	while (*comp == '/')
+		++comp;
+	
+	p = grecs_malloc(len + strlen(comp) + 2);
+	memcpy(p, dir, len);
+	p[len++] = '/';
+	strcpy(p + len, comp);
+	return p;
+}