simple-authentication.lua: tie secure cookies to field names

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index d8cc4d7a3d43beaee1a423a22ea9a33d8a5487e5..ff03cb25adf5eeb9ea5a09dc0bbc084921cae5e1 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -65,6 +65,13 @@ const char *cgit_hosturl()
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 

+const char *cgit_currenturl()
+{
+       if (!ctx.qry.url)
+               return cgit_rooturl();
+       return ctx.qry.url;
+}
+

 const char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
 const char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)


@@ -140,14 +147,14 @@ const char *cgit_repobasename(const char *reponame)
        return rvbuf;
 }
 
        return rvbuf;
 }
 

-static void site_url(const char *page, const char *search, const char *sort, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)

 {
        char *delim = "?";
 
 {
        char *delim = "?";
 

-       if (ctx.cfg.virtual_root)
-               html_attr(ctx.cfg.virtual_root);
+       if (always_root || page)
+               html_attr(cgit_rooturl());

        else
        else

-               html_url_path(ctx.cfg.script_name);
+               html_attr(cgit_currenturl());

 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);


@@ -172,7 +179,7 @@ static void site_url(const char *page, const char *search, const char *sort, int
 }
 
 static void site_link(const char *page, const char *name, const char *title,
 }
 
 static void site_link(const char *page, const char *name, const char *title,

-                     const char *class, const char *search, const char *sort, int ofs)
+                     const char *class, const char *search, const char *sort, int ofs, int always_root)

 {
        html("<a");
        if (title) {
 {
        html("<a");
        if (title) {


@@ -186,16 +193,16 @@ static void site_link(const char *page, const char *name, const char *title,
                html("'");
        }
        html(" href='");
                html("'");
        }
        html(" href='");

-       site_url(page, search, sort, ofs);
+       site_url(page, search, sort, ofs, always_root);

        html("'>");
        html_txt(name);
        html("</a>");
 }
 
 void cgit_index_link(const char *name, const char *title, const char *class,
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
 void cgit_index_link(const char *name, const char *title, const char *class,

-                    const char *pattern, const char *sort, int ofs)
+                    const char *pattern, const char *sort, int ofs, int always_root)

 {
 {

-       site_link(NULL, name, title, class, pattern, sort, ofs);
+       site_link(NULL, name, title, class, pattern, sort, ofs, always_root);

 }
 
 static char *repolink(const char *title, const char *class, const char *page,
 }
 
 static char *repolink(const char *title, const char *class, const char *page,


@@ -439,7 +446,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
 {
        if (!strcmp(ctx.qry.page, "repolist"))
                cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
 {
        if (!strcmp(ctx.qry.page, "repolist"))
                cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,

-                               ctx.qry.ofs);
+                               ctx.qry.ofs, 1);

        else if (!strcmp(ctx.qry.page, "summary"))
                cgit_summary_link(name, title, class, ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tag"))
        else if (!strcmp(ctx.qry.page, "summary"))
                cgit_summary_link(name, title, class, ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tag"))


@@ -751,31 +758,19 @@ void cgit_print_docend()
 
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
 
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {

-       struct strbuf buf = STRBUF_INIT;
-       char *h = txt, *t, c;
+       struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
+       int i;

 
 

-       while (h && *h) {
-               while (h && *h == ' ')
-                       h++;
-               if (!*h)
-                       break;
-               t = h;
-               while (t && *t && *t != ' ')
-                       t++;
-               c = *t;
-               *t = 0;
-
-               if (suffix && *suffix) {
-                       strbuf_reset(&buf);
-                       strbuf_addf(&buf, "%s/%s", h, suffix);
-                       h = buf.buf;
-               }
-               fn(h);
-               *t = c;
-               h = t;
+       for (i = 0; url_list[i]; i++) {
+               strbuf_rtrim(url_list[i]);
+               if (url_list[i]->len == 0)
+                       continue;
+               if (suffix && *suffix)
+                       strbuf_addf(url_list[i], "/%s", suffix);
+               fn(url_list[i]->buf);

        }
 
        }
 

-       strbuf_release(&buf);
+       strbuf_list_free(url_list);

 }
 
 void cgit_add_clone_urls(void (*fn)(const char *))
 }
 
 void cgit_add_clone_urls(void (*fn)(const char *))


@@ -880,7 +875,7 @@ static void print_header(void)
 
        html("<td class='main'>");
        if (ctx.repo) {
 
        html("<td class='main'>");
        if (ctx.repo) {

-               cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0, 1);

                html(" : ");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                if (ctx.env.authenticated) {
                html(" : ");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                if (ctx.env.authenticated) {


@@ -958,13 +953,13 @@ void cgit_print_pageheader(void)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {

-               site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0);
+               site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1);

                if (ctx.cfg.root_readme)
                        site_link("about", "about", NULL, hc("about"),
                if (ctx.cfg.root_readme)
                        site_link("about", "about", NULL, hc("about"),

-                                 NULL, NULL, 0);
+                                 NULL, NULL, 0, 1);

                html("</td><td class='form'>");
                html("<form method='get' action='");
                html("</td><td class='form'>");
                html("<form method='get' action='");

-               html_attr(cgit_rooturl());
+               html_attr(cgit_currenturl());

                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);