Update c-cpp.yml

Since INSTALL_CFG_DEST is a symlink we also need to make sure that the target always exists before installing anything to it.

Fixes f860ea9e54 Install chrooted configuration with make install on linux

.github/workflows/c-cpp.yml

@@ -37,7 +37,7 @@ jobs:
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
     - name: SSLPlugin Linux
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
-      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
+      run: "sed -i '/^PLUGIN/s/$/ SSLPlugin/' Makefile && sed -i '/^LIBS/s/$/ -lcrypto -lssl/' Makefile"
     - name: make
       run: make
     - name: mkdir

Makefile.Linux

@@ -103,7 +103,7 @@ install-chroot-dir:
 	$(INSTALL_BIN) -d $(CHROOTDIR)/libexec
 	chmod -R o-rwx $(CHROOTDIR)
 
-install-etc-default-config:
+install-etc-default-config: install-chroot-dir
 	if [ ! -d $(INSTALL_CFG_DEST) ]; then \
 	   ln -s $(CHROOTREL)/conf $(INSTALL_CFG_DEST); \
 	   $(INSTALL_BIN) $(INSTALL_CFG) $(ETCDIR)/3proxy.cfg; \

debian/postinst

@@ -19,8 +19,8 @@ fi
 echo ""
 echo 3proxy installed.
 if /bin/systemctl >/dev/null 2>&1; then \
- /bin/systemctl stop 3proxy.service \
- /bin/systemctl start 3proxy.service \
+ /bin/systemctl stop 3proxy.service ;\
+ /bin/systemctl start 3proxy.service ;\
  echo use ;\
  echo "  "systemctl start 3proxy.service ;\
  echo to start proxy ;\

src/plugins/SSLPlugin/ssl_plugin.c

@@ -361,11 +361,13 @@ SSL_CTX * ssl_cli_ctx(SSL_CONFIG *config, X509 *server_cert, EVP_PKEY *server_ke
 	return NULL;
     }
 
-    err = SSL_CTX_use_certificate(ctx, (X509 *) server_cert);
-    if ( err <= 0 ) {
-	*errSSL = getSSLErr();
-	SSL_CTX_free(ctx);
-	return NULL;
+    if(server_cert) {
+        err = SSL_CTX_use_certificate(ctx, (X509 *) server_cert);
+	if ( err <= 0 ) {
+	    *errSSL = getSSLErr();
+	    SSL_CTX_free(ctx);
+	    return NULL;
+	}
     }
 
     err = SSL_CTX_use_PrivateKey(ctx, server_key);
@@ -379,8 +381,6 @@ SSL_CTX * ssl_cli_ctx(SSL_CONFIG *config, X509 *server_cert, EVP_PKEY *server_ke
     if(config->server_cipher_list)SSL_CTX_set_cipher_list(ctx, config->server_cipher_list);
     if(config->server_ciphersuites)SSL_CTX_set_ciphersuites(ctx, config->server_ciphersuites);
     if(config->server_verify){
-fprintf(stderr, "server verify\n");
-fflush(stderr);
                 if(config->server_ca_file || config->server_ca_dir){
                     SSL_CTX_load_verify_locations(ctx, config->server_ca_file, config->server_ca_dir);
                 }
@@ -483,18 +483,17 @@ static void* ssl_filter_open(void * idata, struct srvparam * srv){
 	}
 	if(serv){
 	    if(!srvcert || !srvkey) return sc;
-	    sc->server_cert = getCert(srvcert);
-	    if(!sc->server_cert){
-		fprintf(stderr, "failed to read: %s\n", srvcert);
-		return sc;
-	    }
 	    if(!sc->server_key){
 		return sc;
 	    }
-	    if(!(sc->cli_ctx = ssl_cli_ctx(sc, sc->server_cert, sc->server_key, &errSSL))){
+	    if(!(sc->cli_ctx = ssl_cli_ctx(sc, NULL, sc->server_key, &errSSL))){
 		fprintf(stderr, "failed to create context: %s\n", errSSL);
 		return sc;
 	    }
+	    if(SSL_CTX_use_certificate_chain_file(sc->cli_ctx, srvcert) != 1){
+		fprintf(stderr, "failed to read server cert: %s\n", srvcert);
+		return sc;
+	    }
 	    sc->serv = 1;
 	}
 	if(mitm || cli || serv){
@@ -534,7 +533,7 @@ static void* ssl_filter_open(void * idata, struct srvparam * srv){
 #endif		
 		else 
 		    SSL_CTX_set_default_verify_paths(sc->srv_ctx);
-		SSL_CTX_set_verify(sc->srv_ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
+		    SSL_CTX_set_verify(sc->srv_ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
 	    }
 	}
 #ifdef WIWHSPLICE