Merge pull request #3 from serogaq/feature/2.getLogsSniffedDomains

2 / Logs: sniffed & blocked domains

logger/logger.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"time"
+	"strings"
 
 	"github.com/op/go-logging"
 )
@@ -126,3 +127,35 @@ func GetLogs(c int, level string) []string {
 	}
 	return output
 }
+
+func GetLogsSniffedDomains(c int) []string {
+	var output []string
+	logLevel, _ := logging.LogLevel("info")
+
+	for i := len(logBuffer) - 1; i >= 0 && len(output) <= c; i-- {
+		if logBuffer[i].level <= logLevel && strings.Contains(logBuffer[i].log, "sniffed domain: ") {
+			index := strings.LastIndex(logBuffer[i].log, ": ")
+			if index != -1 {
+				domain := logBuffer[i].log[index+2:]
+				output = append(output, fmt.Sprintf("%s - %s", logBuffer[i].time, domain))
+			}
+		}
+	}
+	return output
+}
+
+func GetLogsBlockedDomains(c int) []string {
+	var output []string
+	logLevel, _ := logging.LogLevel("info")
+
+	for i := len(logBuffer) - 1; i >= 0 && len(output) <= c; i-- {
+		if logBuffer[i].level <= logLevel && strings.Contains(logBuffer[i].log, "[blocked] for ") {
+			index := strings.LastIndex(logBuffer[i].log, "for [")
+			if index != -1 {
+				domain := strings.Replace(logBuffer[i].log[index+5:], "]", "", -1)
+				output = append(output, fmt.Sprintf("%s - %s", logBuffer[i].time, domain))
+			}
+		}
+	}
+	return output
+}

web/controller/server.go

@@ -45,6 +45,8 @@ func (a *ServerController) initRouter(g *gin.RouterGroup) {
 	g.POST("/restartXrayService", a.restartXrayService)
 	g.POST("/installXray/:version", a.installXray)
 	g.POST("/logs/:count", a.getLogs)
+	g.GET("/logs-sniffed/:count", a.getLogsSniffedDomains)
+	g.GET("/logs-blocked/:count", a.getLogsBlockedDomains)
 	g.POST("/getConfigJson", a.getConfigJson)
 	g.GET("/getDb", a.getDb)
 	g.POST("/importDB", a.importDB)
@@ -125,6 +127,18 @@ func (a *ServerController) getLogs(c *gin.Context) {
 	jsonObj(c, logs, nil)
 }
 
+func (a *ServerController) getLogsSniffedDomains(c *gin.Context) {
+	count := c.Param("count")
+	logs := a.serverService.GetLogsSniffedDomains(count)
+	jsonObj(c, logs, nil)
+}
+
+func (a *ServerController) getLogsBlockedDomains(c *gin.Context) {
+	count := c.Param("count")
+	logs := a.serverService.GetLogsBlockedDomains(count)
+	jsonObj(c, logs, nil)
+}
+
 func (a *ServerController) getConfigJson(c *gin.Context) {
 	configJson, err := a.serverService.GetConfigJson()
 	if err != nil {

web/html/xui/index.html

@@ -125,6 +125,7 @@
                 <a-card hoverable>
                   <b>{{ i18n "menu.link" }}:</b>
                   <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                  <a-tag color="purple" style="cursor: pointer;" @click="openLogDomains()">{{ i18n "pages.index.logDomains" }}</a-tag>
                   <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
                   <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
                 </a-card>
@@ -314,6 +315,43 @@
       </a-form>
       <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto; margin-top: 0.5rem;" v-html="logModal.formattedLogs"></div>
     </a-modal>
+    <a-modal id="log-domains-modal" v-model="logDomainsModal.visible"
+        :closable="true" @cancel="() => logDomainsModal.visible = false"
+        :class="themeSwitcher.currentTheme"
+        width="800px" footer="">
+      <template slot="title">
+        {{ i18n "pages.index.logDomains" }}
+        <a-icon :spin="logDomainsModal.loading"
+          type="sync"
+          style="vertical-align: middle; margin-left: 10px;"
+          :disabled="logDomainsModal.loading"
+          @click="openLogDomains()">
+        </a-icon>
+      </template>
+      <a-form layout="inline">
+        <a-form-item style="margin-right: 0.5rem;">
+          <a-input-group compact>
+            <a-select size="small" v-model="logDomainsModal.rows" style="width:90px;"
+                @change="openLogDomains()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="500">Few</a-select-option>
+              <a-select-option value="2500">Medium</a-select-option>
+              <a-select-option value="7000">Many</a-select-option>
+            </a-select>
+            <a-select size="small" v-model="logDomainsModal.type" style="width:95px;"
+                @change="openLogDomains()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="sniffed">Sniffed</a-select-option>
+              <a-select-option value="blocked">Blocked</a-select-option>
+            </a-select>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item style="float: right;">
+          <a-button type="primary" icon="download"
+            :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logDomainsModal.logs?.join('\n'))" download="x-ui-domains.log">
+          </a-button>
+        </a-form-item>
+      </a-form>
+      <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto; margin-top: 0.5rem;" v-html="logDomainsModal.formattedLogs"></div>
+    </a-modal>
     <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
         :closable="true" footer=""
         :class="themeSwitcher.currentTheme">
@@ -490,6 +528,47 @@
         },
     };
 
+    const logDomainsModal = {
+        visible: false,
+        logs: [],
+        rows: 500,
+        type: 'sniffed',
+        loading: false,
+        show(logs) {
+            this.visible = true;
+            this.logs = logs; 
+            this.formattedLogs = this.logs?.length > 0 ? this.formatLogs(this.logs, this.type) : "No Record...";
+        },
+        formatLogs(logs, type) {
+            let formattedLogs = '';
+
+            logs.forEach((log, index) => {
+                let [data, message] = log.split(" - ",2);
+                const parts = data.split(" ");
+                if(index>0) formattedLogs += '<br>';
+
+                if (parts.length === 2) {
+                    const d = parts[0];
+                    const t = parts[1];
+                    formattedLogs += `<span style="color: gray;">${d} ${t}</span>`;
+                } else {
+                    formattedLogs += `<span style="color: gray;">${data}</span>`;
+                }
+
+                if (message) {
+                    message = "<b>"+(type === 'sniffed' ? 'Sniffed' : 'Blocked')+": </b>" + message;
+                }
+
+                formattedLogs += message ? ' - ' + message : '';
+            });
+
+            return formattedLogs;
+        },
+        hide() {
+            this.visible = false;
+        },
+    };
+
     const backupModal = {
         visible: false,
         title: '',
@@ -595,6 +674,16 @@
                 await PromiseUtil.sleep(500);
                 logModal.loading = false;
             },
+            async openLogDomains(){
+                logDomainsModal.loading = true;
+                const msg = await HttpUtil.get('server/logs-'+(logDomainsModal.type==='blocked'?'blocked':'sniffed')+'/'+logDomainsModal.rows);
+                if (!msg.success) {
+                    return;
+                }
+                logDomainsModal.show(msg.obj);
+                await PromiseUtil.sleep(500);
+                logDomainsModal.loading = false;
+            },
             async openConfig() {
                 this.loading(true);
                 const msg = await HttpUtil.post('server/getConfigJson');

web/service/server.go

@@ -442,6 +442,24 @@ func (s *ServerService) GetLogs(count string, level string, syslog string) []str
 	return lines
 }
 
+func (s *ServerService) GetLogsSniffedDomains(count string) []string {
+	c, _ := strconv.Atoi(count)
+	var lines []string
+
+	lines = logger.GetLogsSniffedDomains(c)
+
+	return lines
+}
+
+func (s *ServerService) GetLogsBlockedDomains(count string) []string {
+	c, _ := strconv.Atoi(count)
+	var lines []string
+
+	lines = logger.GetLogsBlockedDomains(c)
+
+	return lines
+}
+
 func (s *ServerService) GetConfigJson() (interface{}, error) {
 	config, err := s.xrayService.GetXrayConfig()
 	if err != nil {

web/translation/translate.en_US.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Are you sure you want to change the Xray version to"
 "dontRefresh" = "Installation is in progress, please do not refresh this page"
 "logs" = "Logs"
+"logDomains" = "Log Domains"
 "config" = "Config"
 "backup" = "Backup & Restore"
 "backupTitle" = "Database Backup & Restore"

web/translation/translate.es_ES.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "¿Estás seguro de que deseas cambiar la versión de Xray a"
 "dontRefresh" = "La instalación está en progreso, por favor no actualices esta página."
 "logs" = "Registros"
+"logDomains" = "Log Domains"
 "config" = "Configuración"
 "backup" = "Copia de Seguridad y Restauración"
 "backupTitle" = "Copia de Seguridad y Restauración de la Base de Datos"

web/translation/translate.fa_IR.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "آیا از تغییر نسخه‌ مطمئن هستید؟"
 "dontRefresh" = "در حال نصب، لطفا صفحه را رفرش نکنید"
 "logs" = "گزارش‌ها"
+"logDomains" = "Log Domains"
 "config" = "پیکربندی"
 "backup" = "پشتیبان‌گیری"
 "backupTitle" = "پشتیبان‌گیری دیتابیس"

web/translation/translate.id_ID.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Apakah Anda yakin ingin mengubah versi Xray menjadi"
 "dontRefresh" = "Instalasi sedang berlangsung, harap jangan menyegarkan halaman ini"
 "logs" = "Log"
+"logDomains" = "Log Domains"
 "config" = "Konfigurasi"
 "backup" = "Cadangan & Pulihkan"
 "backupTitle" = "Cadangan & Pulihkan Database"

web/translation/translate.pt_BR.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Tem certeza de que deseja alterar a versão do Xray para"
 "dontRefresh" = "Instalação em andamento, por favor não atualize a página"
 "logs" = "Logs"
+"logDomains" = "Log Domains"
 "config" = "Configuração"
 "backup" = "Backup e Restauração"
 "backupTitle" = "Backup e Restauração do Banco de Dados"

web/translation/translate.ru_RU.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Вы точно хотите сменить версию Xray?"
 "dontRefresh" = "Идёт установка. Пожалуйста, не обновляйте эту страницу"
 "logs" = "Логи"
+"logDomains" = "Логи доменов"
 "config" = "Конфигурация"
 "backup" = "Бэкап и восстановление"
 "backupTitle" = "База данных бэкапа и восстановления"

web/translation/translate.tr_TR.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Xray sürümünü değiştirmek istediğinizden emin misiniz"
 "dontRefresh" = "Kurulum devam ediyor, lütfen bu sayfayı yenilemeyin"
 "logs" = "Günlükler"
+"logDomains" = "Log Domains"
 "config" = "Yapılandırma"
 "backup" = "Yedekle & Geri Yükle"
 "backupTitle" = "Veritabanı Yedekleme & Geri Yükleme"

web/translation/translate.uk_UA.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Ви впевнені, що бажаєте змінити версію Xray на"
 "dontRefresh" = "Інсталяція триває, будь ласка, не оновлюйте цю сторінку"
 "logs" = "Журнали"
+"logDomains" = "Логи доменов"
 "config" = "Конфігурація"
 "backup" = "Резервне копіювання та відновлення"
 "backupTitle" = "Резервне копіювання та відновлення бази даних"

web/translation/translate.vi_VN.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "Bạn có chắc chắn muốn chuyển đổi phiên bản Xray sang"
 "dontRefresh" = "Đang tiến hành cài đặt, vui lòng không làm mới trang này."
 "logs" = "Nhật ký"
+"logDomains" = "Log Domains"
 "config" = "Cấu hình"
 "backup" = "Sao lưu & Khôi phục"
 "backupTitle" = "Sao lưu & Khôi phục Cơ sở dữ liệu"

web/translation/translate.zh_CN.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "是否切换 Xray 版本至"
 "dontRefresh" = "安装中，请勿刷新此页面"
 "logs" = "日志"
+"logDomains" = "Log Domains"
 "config" = "配置"
 "backup" = "备份和恢复"
 "backupTitle" = "备份和恢复数据库"

web/translation/translate.zh_TW.toml

@@ -105,6 +105,7 @@
 "xraySwitchVersionDialogDesc" = "是否切換 Xray 版本至"
 "dontRefresh" = "安裝中，請勿重新整理此頁面"
 "logs" = "日誌"
+"logDomains" = "Log Domains"
 "config" = "配置"
 "backup" = "備份和恢復"
 "backupTitle" = "備份和恢復資料庫"