GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-06-04 11:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove same origin check and return proper errors from upgrader function (#5724)

Browse Source 
* chore: test websockets

* chore: test websockets

* chore: test websockets

* chore: test websockets

* chore: cleanup PR

* chore: added back check origin function and loggings to check why the mismatch

* chore: the uuid should update on every new request

* chore: experiment with delaying the query deletion

* chore: experiment with delaying the query deletion

* chore: experiment with delaying the query deletion

* chore: upgrade nginx conf

* chore: upgrade nginx conf

* chore: upgrade nginx conf

* chore: experiment with delaying the query deletion

* chore: cleanup PR

* chore: remove print statements
This commit is contained in:
Vikrant Gupta 2024-08-23 17:37:56 +05:30 committed by GitHub
parent 33541a2ac0
commit a2ac49bfc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deploy/docker/common/nginx-config.conf
View File

@ -1,3 +1,8 @@
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
server {
listen 3301;
server_name _;
@ -42,6 +47,14 @@ server {
proxy_read_timeout 600s;
}
location /ws {
proxy_pass http://query-service:8080/ws;
proxy_http_version 1.1;
proxy_set_header Upgrade "websocket";
proxy_set_header Connection "upgrade";
proxy_read_timeout 86400;
}
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;

13
frontend/src/api/common/getQueryStats.ts
View File

@ -46,4 +46,17 @@ export function getQueryStats(props: GetQueryStatsProps): void {
setData(event?.data);
}
});
socket.addEventListener('error', (event) => {
console.error(event);
});
socket.addEventListener('close', (event) => {
// 1000 is a normal closure status code
if (event.code !== 1000) {
console.error('WebSocket closed with error:', event);
} else {
console.error('WebSocket closed normally.');
}
});
}

7
frontend/src/container/LogsExplorerViews/index.tsx
View File

@ -263,7 +263,10 @@ function LogsExplorerViews({
},
undefined,
listQueryKeyRef,
{},
{
...(!isEmpty(queryId) &&
selectedPanelType !== PANEL_TYPES.LIST && { 'X-SIGNOZ-QUERY-ID': queryId }),
},
);
const getRequestData = useCallback(
@ -352,7 +355,7 @@ function LogsExplorerViews({
useEffect(() => {
setQueryId(v4());
}, [isError, isSuccess]);
}, [data]);
useEffect(() => {
if (

21
pkg/query-service/app/http_handler.go
View File

@ -9,7 +9,6 @@ import (
"io"
"math"
"net/http"
"net/url"
"regexp"
"slices"
"strconv"
@ -214,24 +213,8 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) {
}
aH.Upgrader = &websocket.Upgrader{
// Same-origin check is the server's responsibility in websocket spec.
CheckOrigin: func(r *http.Request) bool {
// Based on the default CheckOrigin implementation in websocket package.
originHeader := r.Header.Get("Origin")
if len(originHeader) < 1 {
return false
}
origin, err := url.Parse(originHeader)
if err != nil {
return false
}
// Allow cross origin websocket connections on localhost
if strings.HasPrefix(origin.Host, "localhost") {
return true
}
return origin.Host == r.Host
return true
},
}
@ -3764,7 +3747,7 @@ func (aH *APIHandler) GetQueryProgressUpdates(w http.ResponseWriter, r *http.Req
// Shouldn't happen unless query progress requested after query finished
zap.L().Warn(
"couldn't subscribe to query progress",
zap.String("queryId", queryId), zap.Any("error", err),
zap.String("queryId", queryId), zap.Any("error", apiErr),
)
return
}