hide passwords in ui + skip empty decode frames

kerberos-io · Jan 12, 2024 · 8c44da8 · 8c44da8
1 parent a8b7994
commit 8c44da8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/machinery/src/capture/main.go b/machinery/src/capture/main.go
@@ -619,7 +619,9 @@ func Base64Image(captureDevice *Capture, communication *models.Communication) st
 
 	// We'll try to have a keyframe, if not we'll return an empty string.
 	var encodedImage string
-	for {
+	// Try for 3 times in a row.
+	count := 0
+	for count < 3 {
 		if queue != nil && cursor != nil && rtspClient != nil {
 			pkt, err := cursor.ReadPacket()
 			if err == nil {
@@ -632,8 +634,10 @@ func Base64Image(captureDevice *Capture, communication *models.Communication) st
 					bytes, _ := utils.ImageToBytes(&img)
 					encodedImage = base64.StdEncoding.EncodeToString(bytes)
 					break
+				} else {
+					count++
+					continue
 				}
-				break
 			}
 		} else {
 			break
@@ -660,15 +664,22 @@ func JpegImage(captureDevice *Capture, communication *models.Communication) imag
 
 	// We'll try to have a keyframe, if not we'll return an empty string.
 	var image image.YCbCr
+	// Try for 3 times in a row.
+	count := 0
 	for {
 		if queue != nil && cursor != nil && rtspClient != nil {
 			pkt, err := cursor.ReadPacket()
 			if err == nil {
 				if !pkt.IsKeyFrame {
 					continue
 				}
-				image, _ = (*rtspClient).DecodePacket(pkt)
-				break
+				image, err = (*rtspClient).DecodePacket(pkt)
+				if err != nil {
+					count++
+					continue
+				} else {
+					break
+				}
 			}
 		} else {
 			break

diff --git a/machinery/src/routers/websocket/main.go b/machinery/src/routers/websocket/main.go
@@ -161,6 +161,8 @@ logreader:
 				if err == nil {
 					bytes, _ := utils.ImageToBytes(&img)
 					encodedImage = base64.StdEncoding.EncodeToString(bytes)
+				} else {
+					continue
 				}
 			} else {
 				log.Log.Error("routers.websocket.main.ForwardSDStream():" + err.Error())

diff --git a/ui/src/pages/Settings/Settings.jsx b/ui/src/pages/Settings/Settings.jsx
@@ -1129,7 +1129,8 @@ class Settings extends React.Component {
                     }
                   />
                   <Input
-                    noPadding
+                    type="password"
+                    iconright="activity"
                     label={t('settings.persistence.kerberoshub_publickey')}
                     placeholder={t(
                       'settings.persistence.kerberoshub_description_publickey'
@@ -1140,7 +1141,8 @@ class Settings extends React.Component {
                     }
                   />
                   <Input
-                    noPadding
+                    type="password"
+                    iconright="activity"
                     label={t('settings.persistence.kerberoshub_privatekey')}
                     placeholder={t(
                       'settings.persistence.kerberoshub_description_privatekey'
@@ -1336,7 +1338,8 @@ class Settings extends React.Component {
                   </div>
 
                   <Input
-                    noPadding
+                    type="password"
+                    iconright="activity"
                     label={t('settings.overview.encryption_fingerprint')}
                     value={config.encryption.fingerprint}
                     onChange={(value) =>
@@ -1349,7 +1352,8 @@ class Settings extends React.Component {
                     }
                   />
                   <Input
-                    noPadding
+                    type="password"
+                    iconright="activity"
                     label={t('settings.overview.encryption_privatekey')}
                     value={config.encryption.private_key}
                     onChange={(value) =>
@@ -1362,7 +1366,8 @@ class Settings extends React.Component {
                     }
                   />
                   <Input
-                    noPadding
+                    type="password"
+                    iconright="activity"
                     label={t('settings.overview.encryption_symmetrickey')}
                     value={config.encryption.symmetric_key}
                     onChange={(value) =>
@@ -2296,7 +2301,8 @@ class Settings extends React.Component {
                         }
                       />
                       <Input
-                        noPadding
+                        type="password"
+                        iconright="activity"
                         label={t(
                           'settings.persistence.kerberosvault_accesskey'
                         )}
@@ -2316,7 +2322,8 @@ class Settings extends React.Component {
                         }
                       />
                       <Input
-                        noPadding
+                        type="password"
+                        iconright="activity"
                         label={t(
                           'settings.persistence.kerberosvault_secretkey'
                         )}