Protocolary updates for release 1.6.7

diff --git a/configure.ac b/configure.ac
index 6de3506c0687b28db4053e991cb148f5bfb8c819..83d5559d8a3367ea14a700a73d3639259af79035 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([fort],[1.6.6],[validadorfort@fortproject.net])
+AC_INIT([fort],[1.6.7],[validadorfort@fortproject.net])
 AC_CONFIG_SRCDIR([src/main.c])
 AM_INIT_AUTOMAKE([subdir-objects])
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8619410382ae824e1534653f07775fccb3d6b4b6..ac1328fb283e0e053dbe52bfe6343159054797c3 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 #--- Alpine build container ---
 FROM alpine:latest AS builder
-ARG FORT_VERSION=1.6.6
+ARG FORT_VERSION=1.6.7
 
 # Install compiler and dependencies
 RUN apk --update --no-cache add build-base autoconf automake pkgconfig jansson-dev check-dev \

diff --git a/docs/_config.yml b/docs/_config.yml
index 5e9fea3d9711560da38f7e8085cce906005217c1..90d9c6d0965f9ac213c6739b7fc46bb1f88c803c 100644 (file)
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -8,7 +8,7 @@ defaults:
       layout: "default"
       image: "/img/logo_validador_og.png"
 
-fort-latest-version: 1.6.6
+fort-latest-version: 1.6.7
 plugins:
   - jekyll-seo-tag
   - jekyll-sitemap

diff --git a/docs/usage.md b/docs/usage.md
index aa1b09a0a15c6da8384f6b549327c7f5ff69c4b9..842234720408214a8438e97e112c63dfe0e8e3a1 100644 (file)
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -1003,17 +1003,14 @@ The configuration options are mostly the same as the ones from the `argv` interf
        "<a href="#--tal">tal</a>": "/tmp/fort/tal/",
        "<a href="#--local-repository">local-repository</a>": "/tmp/fort/repository",
        "<a href="#--maximum-certificate-depth">maximum-certificate-depth</a>": 32,
-       "<a href="#--slurm">slurm</a>": "/tmp/fort/test.slurm",
+       "<a href="#--slurm">slurm</a>": null,
        "<a href="#--mode">mode</a>": "server",
        "<a href="#--work-offline">work-offline</a>": false,
        "<a href="#--daemon">daemon</a>": false,
 
        "server": {
-               "<a href="#--serveraddress">address</a>": [
-                       "192.0.2.1",
-                       "2001:db8::1"
-               ],
-               "<a href="#--serverport">port</a>": 8323,
+               "<a href="#--serveraddress">address</a>": [ "::" ],
+               "<a href="#--serverport">port</a>": 323,
                "<a href="#--serverbacklog">backlog</a>": 4096,
                "interval": {
                        "<a href="#--serverintervalvalidation">validation</a>": 3600,
@@ -1026,6 +1023,10 @@ The configuration options are mostly the same as the ones from the `argv` interf
                }
        },
 
+       "prometheus": {
+               "port": 0
+       },
+
        "rsync": {
                "<a href="#--rsyncenabled">enabled</a>": true,
                "<a href="#--rsyncpriority">priority</a>": 50,
@@ -1068,14 +1069,15 @@ The configuration options are mostly the same as the ones from the `argv` interf
                "<a href="#--httplow-speed-limit">low-speed-limit</a>": 100000,
                "<a href="#--httplow-speed-time">low-speed-time</a>": 10,
                "<a href="#--httpmax-file-size">max-file-size</a>": 2000000000,
-               "<a href="#--httpca-path">ca-path</a>": "/usr/local/ssl/certs"
+               "<a href="#--httpca-path">ca-path</a>": null,
+               "<a href="#--httpproxy">proxy</a>": null
        },
 
        "log": {
                "<a href="#--logenabled">enabled</a>": true,
                "<a href="#--logoutput">output</a>": "console",
                "<a href="#--loglevel">level</a>": "warning",
-               "<a href="#--logtag">tag</a>": "Op",
+               "<a href="#--logtag">tag</a>": null,
                "<a href="#--logfacility">facility</a>": "daemon",
                "<a href="#--logfile-name-format">file-name-format</a>": "global-url",
                "<a href="#--logcolor-output">color-output</a>": false
@@ -1114,8 +1116,8 @@ The configuration options are mostly the same as the ones from the `argv` interf
        ],
 
        "output": {
-               "<a href="#--outputroa">roa</a>": "/tmp/fort/roas.csv",
-               "<a href="#--outputbgpsec">bgpsec</a>": "/tmp/fort/bgpsec.csv",
+               "<a href="#--outputroa">roa</a>": null,
+               "<a href="#--outputbgpsec">bgpsec</a>": null,
                "<a href="#--outputformat">format</a>": "csv"
        },
 

diff --git a/man/fort.8 b/man/fort.8
index 71b62b6d3b6b90add4e0a65d34bc54bc99d8e6a5..40b5af829c93a7bf0d41018f15de44bd7a7c968c 100644 (file)
--- a/man/fort.8
+++ b/man/fort.8
@@ -1,4 +1,4 @@
-.TH fort 8 "2025-02-05" "v1.6.6" "FORT validator"
+.TH fort 8 "2025-09-12" "v1.6.7" "FORT validator"
 
 .SH NAME
 fort \- RPKI validator and RTR server
@@ -1126,7 +1126,7 @@ to a specific value:
       "192.0.2.1",
       "2001:db8::1"
     ],
-    "port": "8323",
+    "port": 8323,
     "backlog": 4096,
     "interval": {
       "validation": 3600,
@@ -1139,6 +1139,10 @@ to a specific value:
     }
   },
 
+  "prometheus": {
+    "port": 0
+  },
+
   "rsync": {
     "enabled": true,
     "priority": 50,
@@ -1174,14 +1178,15 @@ to a specific value:
       "count": 1,
       "interval": 4
     },
-    "user-agent": "fort/1.6.4",
+    "user-agent": "fort/1.6.7",
     "max-redirs": 10,
     "connect-timeout": 30,
     "transfer-timeout": 900,
     "low-speed-limit": 100000,
     "low-speed-time": 10,
     "max-file-size": 2000000000,
-    "ca-path": "/usr/local/ssl/certs"
+    "ca-path": "/usr/local/ssl/certs",
+    "proxy": "https://example.com:1234"
   },
 
   "log": {

diff --git a/src/config.c b/src/config.c
index c11b2e2b52f5c9c6380700d16bc060cdf7ea72d8..25a5c7676a517e9e3aee0a6d87f2f793313a4991 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -436,7 +436,7 @@ static const struct option_field options[] = {
                .doc = "Port to bind the Prometheus server to. "
                    "Prometheus requires this value and 'server' mode to start. "
                    "Unlike server.port, prometheus.port will not be resolved.",
-               .min = 1,
+               .min = 0,
                .max = 0xFFFF,
        },
 
@@ -610,7 +610,7 @@ static const struct option_field options[] = {
                .offset = offsetof(struct rpki_config, http.ca_path),
                .doc = "Directory where CA certificates are found, used to verify the peer",
                .arg_doc = "<directory>",
-               .json_null_allowed = false,
+               .json_null_allowed = true,
        }, {
                .id = 9013,
                .name = "http.proxy",

diff --git a/src/config/str.c b/src/config/str.c
index 2b32ee347b914e08e7e2da5a7e94ae323dc582cf..44e61c00bb55436ffe8f101d951ad373e397f3fb 100644 (file)
--- a/src/config/str.c
+++ b/src/config/str.c
@@ -96,7 +96,7 @@ service_parse_json(struct option_field const *opt, json_t *json, void *result)
                }
 
                strval = pmalloc(6);
-               written = snprintf(strval, 6, JSON_INTEGER_FORMAT, intval);
+               written = snprintf(strval, 6, "%" JSON_INTEGER_FORMAT, intval);
                if (written < 0 || 6 <= written)
                        return pr_op_err("Cannot convert '%s' to string: snprintf returned %d",
                            opt->name, written);