Procházet zdrojové kódy

use consistent spelling of WebSocket

tags/v2.1.0-rc1
Shivaram Lingamneni před 4 roky
rodič
revize
620e30293d
2 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. 3
    3
      irc/config.go
  2. 2
    2
      irc/listeners.go

+ 3
- 3
irc/config.go Zobrazit soubor

478
 		Listeners    map[string]listenerConfigBlock
478
 		Listeners    map[string]listenerConfigBlock
479
 		UnixBindMode os.FileMode        `yaml:"unix-bind-mode"`
479
 		UnixBindMode os.FileMode        `yaml:"unix-bind-mode"`
480
 		TorListeners TorListenersConfig `yaml:"tor-listeners"`
480
 		TorListeners TorListenersConfig `yaml:"tor-listeners"`
481
-		Websockets   struct {
481
+		WebSockets   struct {
482
 			AllowedOrigins       []string `yaml:"allowed-origins"`
482
 			AllowedOrigins       []string `yaml:"allowed-origins"`
483
 			allowedOriginRegexps []*regexp.Regexp
483
 			allowedOriginRegexps []*regexp.Regexp
484
 		}
484
 		}
844
 		return nil, fmt.Errorf("failed to prepare listeners: %v", err)
844
 		return nil, fmt.Errorf("failed to prepare listeners: %v", err)
845
 	}
845
 	}
846
 
846
 
847
-	for _, glob := range config.Server.Websockets.AllowedOrigins {
847
+	for _, glob := range config.Server.WebSockets.AllowedOrigins {
848
 		globre, err := utils.CompileGlob(glob)
848
 		globre, err := utils.CompileGlob(glob)
849
 		if err != nil {
849
 		if err != nil {
850
 			return nil, fmt.Errorf("invalid websocket allowed-origin expression: %s", glob)
850
 			return nil, fmt.Errorf("invalid websocket allowed-origin expression: %s", glob)
851
 		}
851
 		}
852
-		config.Server.Websockets.allowedOriginRegexps = append(config.Server.Websockets.allowedOriginRegexps, globre)
852
+		config.Server.WebSockets.allowedOriginRegexps = append(config.Server.WebSockets.allowedOriginRegexps, globre)
853
 	}
853
 	}
854
 
854
 
855
 	if config.Server.STS.Enabled {
855
 	if config.Server.STS.Enabled {

+ 2
- 2
irc/listeners.go Zobrazit soubor

164
 
164
 
165
 	wsUpgrader := websocket.Upgrader{
165
 	wsUpgrader := websocket.Upgrader{
166
 		CheckOrigin: func(r *http.Request) bool {
166
 		CheckOrigin: func(r *http.Request) bool {
167
-			if len(config.Server.Websockets.allowedOriginRegexps) == 0 {
167
+			if len(config.Server.WebSockets.allowedOriginRegexps) == 0 {
168
 				return true
168
 				return true
169
 			}
169
 			}
170
 			origin := strings.TrimSpace(r.Header.Get("Origin"))
170
 			origin := strings.TrimSpace(r.Header.Get("Origin"))
171
 			if len(origin) == 0 {
171
 			if len(origin) == 0 {
172
 				return false
172
 				return false
173
 			}
173
 			}
174
-			for _, re := range config.Server.Websockets.allowedOriginRegexps {
174
+			for _, re := range config.Server.WebSockets.allowedOriginRegexps {
175
 				if re.MatchString(origin) {
175
 				if re.MatchString(origin) {
176
 					return true
176
 					return true
177
 				}
177
 				}

Načítá se…
Zrušit
Uložit