version 1.0

src/main/resources/logback.xml

@@ -15,4 +15,5 @@
     <root level="debug">
         <appender-ref ref="console"/>
     </root>
+    <logger name="io.netty" level="info"/>
 </configuration>

src/main/resources/net/woggioni/gbcs/gbcs-default.xml

@@ -1,48 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gbcs:server xmlns:gbcs="urn:net.woggioni.gbcs" path="/cache" useVirtualThreads="false">
+<gbcs:server xmlns:gbcs="urn:net.woggioni.gbcs" useVirtualThreads="false">
     <bind host="127.0.0.1" port="11443"/>
-    <cache path="/tmp/gbcs"/>
-    <authorization>
-        <users>
-            <user name="user1" password="password"/>
-            <user name="user2" password="password"/>
-            <user name="user3" password="password"/>
-            <user name="user4" password="password"/>
-            <user name="user5" password="password">
-                <roles>
-                    <reader/>
-                    <writer/>
-                </roles>
-            </user>
-        </users>
-        <groups>
-            <group name="group1">
-                <users>
-                    <user ref="user1"/>
-                </users>
-                <roles>
-                    <reader/>
-                    <writer/>
-                </roles>
-            </group>
-            <group name="group2">
-                <users>
-                    <user ref="user1"/>
-                    <user ref="user2"/>
-                </users>
-                <roles>
-                    <reader/>
-                    <writer/>
-                </roles>
-            </group>
-        </groups>
-    </authorization>
-    <tls-certificate-authorization>
-        <group-extractor attribute-name="CN" pattern="(.*)"/>
-        <user-extractor attribute-name="CN" pattern="(.*)"/>
-    </tls-certificate-authorization>
-<!--    <tls verify-clients="false">-->
-<!--        <keystore file="" key-alias=""/>-->
-<!--        <truststore file=""/>-->
-<!--    </tls>-->
+    <cache>
+        <file-system-cache path="/tmp/gbcs" max-age="P7D"/>
+    </cache>
+    <authentication>
+        <none/>
+    </authentication>
 </gbcs:server>

src/main/resources/net/woggioni/gbcs/gbcs.xsd

@@ -7,8 +7,11 @@
     <xs:complexType name="serverType">
         <xs:sequence minOccurs="0">
             <xs:element name="bind" type="gbcs:bindType" maxOccurs="1"/>
-            <xs:element name="cache" type="gbcs:cacheDirType" maxOccurs="1"/>
-            <xs:element name="authorization" type="gbcs:authorizationType" maxOccurs="1">
+            <xs:element name="cache" type="gbcs:cacheType" maxOccurs="1"/>
+<!--            <xs:choice>-->
+<!--                <xs:element name="fileSystemCache" type="fileSystemCacheType"/>-->
+<!--            </xs:choice>-->
+            <xs:element name="authorization" type="gbcs:authorizationType" minOccurs="0">
                 <xs:key name="userId">
                     <xs:selector xpath="users/user"/>
                     <xs:field xpath="@name"/>
@@ -18,10 +21,11 @@
                     <xs:field xpath="@ref"/>
                 </xs:keyref>
             </xs:element>
+            <xs:element name="authentication" type="gbcs:authenticationType" maxOccurs="1"/>
             <xs:element name="tls-certificate-authorization" type="gbcs:tlsCertificateAuthorizationType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="tls" type="gbcs:tlsType" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
-        <xs:attribute name="path" type="xs:string"/>
+        <xs:attribute name="path" type="xs:string" use="optional"/>
         <xs:attribute name="useVirtualThreads" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
@@ -30,8 +34,15 @@
         <xs:attribute name="port" type="xs:unsignedShort" use="required"/>
     </xs:complexType>
 
-    <xs:complexType name="cacheDirType">
+    <xs:complexType name="cacheType">
+        <xs:choice>
+            <xs:element name="file-system-cache" type="gbcs:fileSystemCacheType"/>
+        </xs:choice>
+    </xs:complexType>
+
+    <xs:complexType name="fileSystemCacheType">
         <xs:attribute name="path" type="xs:string" use="required"/>
+        <xs:attribute name="max-age" type="xs:string" default="P1D"/>
     </xs:complexType>
 
     <xs:complexType name="tlsCertificateAuthorizationType">
@@ -58,6 +69,14 @@
         </xs:all>
     </xs:complexType>
 
+    <xs:complexType name="authenticationType">
+        <xs:choice>
+            <xs:element name="basic"/>
+            <xs:element name="client-certificate" type="gbcs:tlsCertificateAuthorizationType"/>
+            <xs:element name="none"/>
+        </xs:choice>
+    </xs:complexType>
+
     <xs:complexType name="usersType">
         <xs:sequence>
             <xs:element name="user" type="gbcs:userType" minOccurs="0" maxOccurs="unbounded"/>
@@ -65,9 +84,6 @@
     </xs:complexType>
 
     <xs:complexType name="userType">
-        <xs:all minOccurs="0" maxOccurs="1">
-            <xs:element name="roles" type="gbcs:rolesType"/>
-        </xs:all>
         <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="password" type="xs:string" use="optional"/>
     </xs:complexType>