hotfix rc6

Author: qiaofeng1227

apphub/src/api/v1/routers/app.py

@@ -192,7 +192,7 @@ async def app_redeploy(
     endpointId: int = Query(None, description="Endpoint ID to redeploy app on. If not set, redeploy on the local endpoint"),
     pullImage: bool = Query(..., description="Whether to pull the image when redeploying the app"),
 ):
-    
+
     async def log_generator(queue: asyncio.Queue):
         error_occurred = False
         try:

apphub/src/api/v1/routers/proxy.py

@@ -6,8 +6,6 @@
 from src.schemas.errorResponse import ErrorResponse
 from src.schemas.proxyHosts import ProxyHost
 from src.services.app_manager import AppManger
-from src.services.proxy_manager import ProxyManager
-from src.core.logger import logger
 
 router = APIRouter()
 
@@ -27,19 +25,6 @@ def get_proxys(
     ):
     return AppManger().get_proxys_by_app(app_id,endpointId)
 
-@router.get(
-            "/proxys/ssl/certificates",
-            summary="Get SSL Certificates",
-            description="Get all ssl certificates",
-            responses={
-                200: {"model": list[dict]},
-                400: {"model": ErrorResponse},
-                500: {"model": ErrorResponse},
-            }
-        )
-def get_certificates():
-    return ProxyManager().get_all_certificates()
-
 @router.post(
             "/proxys/{app_id}",
             summary="Create Proxy",
@@ -55,7 +40,6 @@ def create_proxys(
     app_id: str = Path(..., description="App ID to create proxys from"),
     endpointId: int = Query(None, description="Endpoint ID to create proxys from. If not set, create proxys from the local endpoint"),
 ):
-    
     return AppManger().create_proxy_by_app(app_id,domain_names.domain_names,endpointId)
 
 @router.put(
@@ -110,6 +94,4 @@ def delete_proxys_by_id(
 ):
     client_host = request.headers.get("Host")
     # client_host = request.client.host
-    AppManger().remove_proxy_by_id(proxy_id,client_host)
-
-
+    AppManger().remove_proxy_by_id(proxy_id,client_host)

apphub/src/config/config.ini

@@ -3,10 +3,7 @@ base_url = http://websoft9-proxy:81/api
 user_name = admin@mydomain.com
 user_pwd = hJUGWrlDgqmGglr0
 nike_name = admin
-listen_port = 9000
-docker0_ip = 172.17.0.1
-ssl_cert = /data/custom_ssl/websoft9-self-signed.cert
-ssl_key = /data/custom_ssl/websoft9-self-signed.key
+listen_port = 8888
 
 [gitea]
 base_url = http://websoft9-git:3000/api/v1
@@ -20,16 +17,16 @@ user_name = admin
 user_pwd = R@9)qn)t9hJW
 
 [api_key]
-key = 9e66918137d882c6ebdc1eccb0866e25172c5f8fa2101458a8ce9b044e4c7e5e
+key = 61a9d013db3231c4a3ba45353437930815d524392a0db6502824476cc18d2130
 
 [docker_mirror]
 url = https://artifact.websoft9.com/release/websoft9/mirrors.json
 
 [domain]
-wildcard_domain = 
+wildcard_domain =
 
 [cockpit]
-port = 9090
+port = 9000
 
 [initial_apps]
 keys = 

apphub/src/config/system.ini

@@ -20,4 +20,5 @@ keys = wordpress,zentao,passbolt,moodle,mautic,espocrm,ttrss,discuz,mixpost,next
 
 [webhook]
 wechat = https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9393241f-05b6-45a2-a3e7-b3ab5275cf09
-monitor_api = https://monitor.service.websoft9.com
+monitor_api = https://monitor-gnfarrpanp.cn-zhangjiakou-vpc.fcapp.run
+

apphub/src/external/nginx_proxy_manager_api.py

@@ -142,14 +142,3 @@ def delete_proxy_host(self, proxy_id: int):
             Response: Response from Nginx Proxy Manager API
         """
         return self.api.delete(path=f"nginx/proxy-hosts/{proxy_id}")
-
-    def get_certificates(self):
-        """
-        get all certificates
-
-        Returns:
-            Response: Response from Nginx Proxy Manager API
-        """
-        return self.api.get(
-            path="nginx/certificates", params={"expand": "owner,proxy_hosts,dead_hosts,redirection_hosts"}
-        )

apphub/src/schemas/appSettings.py

@@ -4,10 +4,6 @@ class NginxProxyManagerSetting(BaseModel):
     base_url: HttpUrl = Field(..., title="The base url for nginx proxy manager")
     user_name: str = Field(..., title="The user name for nginx proxy manager")
     user_pwd: str = Field(..., title="The user password for nginx proxy manager")
-    listen_port: int = Field(..., title="The listen port for nginx proxy manager")
-    docker0_ip: str = Field(..., title="The docker0 IP for nginx proxy manager")
-    ssl_cert: str = Field(..., title="The SSL certificate path for nginx proxy manager")
-    ssl_key: str = Field(..., title="The SSL key path for nginx proxy manager")
 
 class GiteaSetting(BaseModel):
     base_url: HttpUrl = Field(..., title="The base url for gitea")

apphub/src/services/app_manager.py

@@ -680,17 +680,14 @@ async def send_log(message: str):
             # Chenck the apps number
             check_apps_number(endpointId)
 
-        #fix bug(上面排除了状态为Inactive的，导致状态为Inactive的不能重建，这里重新加入)
-        app_official = [app for app in appInstallApps if app.app_official == True and (app.status == 1 or app.status == 2)]
-
         portainerManager = PortainerManager()
 
         # Check the endpointId is exists.
         if endpointId:
             check_endpointId(endpointId, portainerManager)
         else:
             endpointId = portainerManager.get_local_endpoint_id()
-
+        
         # validate the app_id is exists in portainer
         await send_log("Verify Application Status")
         is_stack_exists =  portainerManager.check_stack_exists(app_id,endpointId)
@@ -702,7 +699,6 @@ async def send_log(message: str):
             )
         # Get stack_id
         stack_id = portainerManager.get_stack_by_name(app_id,endpointId).get("Id",None)
-       
         if stack_id is None:
             raise CustomException(
                 status_code=400,

apphub/src/services/proxy_manager.py

@@ -94,8 +94,6 @@ def _handler_nginx_error(self,response):
         Args:
             response (Response): Response
         """
-        logger.access(f"Nginx error handler called with status: {response.status_code}")
-        logger.access(f"Nginx error response text: {response.text}")
         # If status_code is 500, raise CustomException
         if response.status_code == 500:
             logger.error(f"Nginx Proxy Manager API Error:{response.status_code}:{response.text}")
@@ -105,7 +103,6 @@ def _handler_nginx_error(self,response):
             response_dict = json.loads(response.text)
             error_dict = response_dict.get('error', {})
             details = error_dict.get('message','Unknown Error')
-            logger.access(f"Extracted error details: {details}")
             raise CustomException(
                 status_code=400,
                 message=f"Invalid Request",
@@ -336,16 +333,4 @@ def get_proxy_host_by_id(self,proxy_id:int):
         except Exception as e:
             logger.error(f"Get proxy host by id:{proxy_id} error:{e}")
             raise CustomException()
-
-    def get_all_certificates(self):
-        """
-        Get all certificates
-
-        Returns:
-            list[dict]: Certificates
-        """
-        response = self.nginx.get_certificates()
-        if response.status_code == 200:
-            return response.json()
-        else:
-            self._handler_nginx_error(response)
+        

changelog_latest.md

@@ -1,9 +1,10 @@
 ### enhancement:
 
-- Add ssl for Websoft9 Console at Settings #640
-- 80,443 is a non-essential port during websoft9 installation. #639
-- Requirements changes about adding console_port #638
-- Enable HTTPS access for Websoft9 console #637
+- 【Websoft9 优化】-- 服务状态监控 #626
+- 【Websoft9 优化】-- PHP 版本管理 #627
+- 【Websoft9 优化】-- 系统指标 #628
+- 【Websoft9 优化】-- 网关集成 WAF 能力 #629
+- 【Websoft9 优化】-- 备份与恢复 #630
 
 
 

cockpit/cockpit.conf

@@ -3,5 +3,3 @@
 [WebService]
 AllowUnencrypted = true
 LoginTitle= Websoft9 - Linux AppStore
-ProtocolHeader = X-Forwarded-Proto
-Origins = http://172.17.0.1:9000 ws://172.17.0.1:9000