r4590 - in trunk/varnish-cache: include lib/libvarnish

phk at projects.linpro.no phk at projects.linpro.no
Fri Feb 26 13:04:06 CET 2010


Author: phk
Date: 2010-02-26 13:04:06 +0100 (Fri, 26 Feb 2010)
New Revision: 4590

Added:
   trunk/varnish-cache/lib/libvarnish/cli_auth.c
Modified:
   trunk/varnish-cache/include/cli_common.h
   trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Add a function to calculate the proper response to a AUTH challenge
from the CLI.

Put in a separate source file, as it should be included in libvarnishapi
as well.



Modified: trunk/varnish-cache/include/cli_common.h
===================================================================
--- trunk/varnish-cache/include/cli_common.h	2010-02-26 09:37:57 UTC (rev 4589)
+++ trunk/varnish-cache/include/cli_common.h	2010-02-26 12:04:06 UTC (rev 4590)
@@ -47,3 +47,5 @@
 
 int cli_writeres(int fd, const struct cli *cli);
 int cli_readres(int fd, unsigned *status, char **ptr, double tmo);
+
+void CLI_response(int S_fd, const char *challenge, char *reponse);

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am	2010-02-26 09:37:57 UTC (rev 4589)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am	2010-02-26 12:04:06 UTC (rev 4590)
@@ -11,6 +11,7 @@
 	assert.c \
 	binary_heap.c \
 	subproc.c \
+	cli_auth.c \
 	cli_common.c \
 	cli_serve.c \
 	flopen.c \

Added: trunk/varnish-cache/lib/libvarnish/cli_auth.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_auth.c	                        (rev 0)
+++ trunk/varnish-cache/lib/libvarnish/cli_auth.c	2010-02-26 12:04:06 UTC (rev 4590)
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 2010 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "svnid.h"
+SVNID("$Id$");
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "cli.h"
+#include "cli_common.h"
+#include "vsha256.h"
+
+void
+CLI_response(int S_fd, const char *challenge, char *response)
+{
+	SHA256_CTX ctx;
+	uint8_t buf[BUFSIZ];
+	int i;
+
+	SHA256_Init(&ctx);
+	SHA256_Update(&ctx, challenge, 32);
+	SHA256_Update(&ctx, "\n", 1);
+	do {
+		i = read(S_fd, buf, sizeof buf);
+		if (i > 0)
+			SHA256_Update(&ctx, buf, i);
+	} while (i > 0);
+	SHA256_Update(&ctx, challenge, 32);
+	SHA256_Update(&ctx, "\n", 1);
+	SHA256_Final(buf, &ctx);
+	for(i = 0; i < SHA256_LEN; i++)
+		sprintf(response + 2 * i, "%02x", buf[i]);
+}



More information about the varnish-commit mailing list