diff --git a/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java b/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java index f5b721350..91883a950 100644 --- a/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java @@ -77,7 +77,7 @@ public class PasswordManagerAgentStrategy implements SshIdentityAgentStrategy { .nameAndDescription("passwordManagerSshKeyConfig") .addComp(pwmanDisplay) .hide(pwmanErrorProp.isNull()) - .nameAndDescription(useKeyName() ? "agentKeyName" : "publicKey") + .nameAndDescription(useKeyName() ? "agentKeyName" : "publicKeyRequired") .addComp(new SshAgentKeyListComp(config.getFileSystem(), p, identifier, useKeyName()), identifier) .disable(pwmanErrorProp.isNotNull()) .nonNull() diff --git a/app/src/main/java/io/xpipe/app/util/DocumentationLink.java b/app/src/main/java/io/xpipe/app/util/DocumentationLink.java index 8bf6f57b9..5c197cfcf 100644 --- a/app/src/main/java/io/xpipe/app/util/DocumentationLink.java +++ b/app/src/main/java/io/xpipe/app/util/DocumentationLink.java @@ -107,6 +107,7 @@ public enum DocumentationLink { BEACON_PORT_BIND("troubleshoot/beacon-port"), SERIAL_IMPLEMENTATION("guide/serial#serial-implementations"), SERIAL_PORTS("guide/serial#serial-ports"), + IDENTITIES("guide/identities"), TERMINAL("guide/terminals#noteworthy-integrations"), TERMINAL_LOGGING("guide/terminals#logging"), TERMINAL_LOGGING_FILES("guide/terminals#output-format"), diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoiceBuilder.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoiceBuilder.java index 189a462e7..84402597d 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoiceBuilder.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityChoiceBuilder.java @@ -129,6 +129,7 @@ public class IdentityChoiceBuilder { var options = new OptionsBuilder() .nameAndDescription(userChoiceTranslationKey) + .documentationLink(DocumentationLink.IDENTITIES) .addComp(new IdentitySelectComp(ref, user, pass, identityStrategy, allowCustomUserInput), user) .nonNullIf(inPlaceSelected.and(new SimpleBooleanProperty(requireUserInput))) .name(Bindings.createStringBinding( diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java index 2668e302d..3163abbc3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java @@ -6,6 +6,7 @@ import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.hub.comp.StoreSection; import io.xpipe.app.hub.comp.SystemStateComp; +import io.xpipe.app.util.DocumentationLink; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; @@ -14,6 +15,11 @@ import java.util.List; public abstract class IdentityStoreProvider implements DataStoreProvider { + @Override + public DocumentationLink getHelpLink() { + return DocumentationLink.IDENTITIES; + } + @Override public List getSearchableTerms(DataStore store) { IdentityStore s = store.asNeeded(); diff --git a/lang/strings/translations_da.properties b/lang/strings/translations_da.properties index 94597db6d..0767bc402 100644 --- a/lang/strings/translations_da.properties +++ b/lang/strings/translations_da.properties @@ -1604,6 +1604,8 @@ sshAgentSocket=Brugerdefineret SSH-agent-socket sshAgentSocketDescription=Den brugerdefinerede socket, der skal bruges til at kommunikere med SSH-agenten. Denne brugerdefinerede agent kan bruges til en forbindelse ved at vælge indstillingen brugerdefineret agent for den. publicKey=Nøglevælger publicKeyDescription=Den valgfri offentlige nøgle for at tvinge agenten til kun at tilbyde den matchende private nøgle +publicKeyRequired=Nøglevælger +publicKeyRequiredDescription=Den offentlige nøgle for at tvinge agenten til kun at tilbyde den matchende private nøgle agentKeyName=Nøglevælger agentKeyNameDescription=Navnet på SSH-nøgleposten i password manager-agenten actions=Handlinger diff --git a/lang/strings/translations_de.properties b/lang/strings/translations_de.properties index d2a069734..15ec124d4 100644 --- a/lang/strings/translations_de.properties +++ b/lang/strings/translations_de.properties @@ -1599,6 +1599,8 @@ sshAgentSocket=Benutzerdefinierter SSH-Agent-Socket sshAgentSocketDescription=Der benutzerdefinierte Socket, der für die Kommunikation mit dem SSH-Agenten verwendet wird. Dieser benutzerdefinierte Agent kann für eine Verbindung verwendet werden, indem du die Option benutzerdefinierter Agent für ihn auswählst. publicKey=Schlüsselselektor publicKeyDescription=Der optionale öffentliche Schlüssel, um den Agenten zu zwingen, nur den passenden privaten Schlüssel anzubieten +publicKeyRequired=Schlüsselselektor +publicKeyRequiredDescription=Der öffentliche Schlüssel, um den Agenten zu zwingen, nur den passenden privaten Schlüssel anzubieten agentKeyName=Schlüsselselektor agentKeyNameDescription=Der Name des SSH-Schlüssel-Eintrags im Passwortmanager-Agenten actions=Aktionen diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index 7704ae1fd..ed25445aa 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -1631,6 +1631,8 @@ sshAgentSocket=Custom SSH agent socket sshAgentSocketDescription=The custom socket to use to communicate with the SSH agent. This custom agent can be used for a connection by selecting the custom agent option for it. publicKey=Key selector publicKeyDescription=The optional public key to force the agent to only offer the matching private key +publicKeyRequired=Key selector +publicKeyRequiredDescription=The public key to force the agent to only offer the matching private key agentKeyName=Key selector agentKeyNameDescription=The name of the SSH key entry in the password manager agent actions=Actions diff --git a/lang/strings/translations_es.properties b/lang/strings/translations_es.properties index 5252be6b3..93df22957 100644 --- a/lang/strings/translations_es.properties +++ b/lang/strings/translations_es.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Socket de agente SSH personalizado sshAgentSocketDescription=El socket personalizado a utilizar para comunicarse con el agente SSH. Este agente personalizado puede utilizarse para una conexión seleccionando la opción agente personalizado para él. publicKey=Selector de teclas publicKeyDescription=La clave pública opcional para obligar al agente a ofrecer sólo la clave privada correspondiente +publicKeyRequired=Selector de teclas +publicKeyRequiredDescription=La clave pública para obligar al agente a ofrecer sólo la clave privada correspondiente agentKeyName=Selector de teclas agentKeyNameDescription=El nombre de la entrada de la clave SSH en el agente gestor de contraseñas actions=Acciones diff --git a/lang/strings/translations_fr.properties b/lang/strings/translations_fr.properties index 57c55da3e..03a8309a3 100644 --- a/lang/strings/translations_fr.properties +++ b/lang/strings/translations_fr.properties @@ -1602,6 +1602,8 @@ sshAgentSocket=Socket d'agent SSH personnalisé sshAgentSocketDescription=La prise personnalisée à utiliser pour communiquer avec l'agent SSH. Cet agent personnalisé peut être utilisé pour une connexion en sélectionnant l'option d'agent personnalisé pour lui. publicKey=Sélecteur de touches publicKeyDescription=La clé publique optionnelle pour forcer l'agent à n'offrir que la clé privée correspondante +publicKeyRequired=Sélecteur de touches +publicKeyRequiredDescription=La clé publique pour forcer l'agent à n'offrir que la clé privée correspondante agentKeyName=Sélecteur de touches agentKeyNameDescription=Le nom de l'entrée de la clé SSH dans l'agent du gestionnaire de mots de passe actions=Actions diff --git a/lang/strings/translations_id.properties b/lang/strings/translations_id.properties index 25838d081..e40d66afa 100644 --- a/lang/strings/translations_id.properties +++ b/lang/strings/translations_id.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Soket agen SSH khusus sshAgentSocketDescription=Soket khusus yang digunakan untuk berkomunikasi dengan agen SSH. Agen khusus ini dapat digunakan untuk koneksi dengan memilih opsi agen khusus untuknya. publicKey=Pemilih kunci publicKeyDescription=Kunci publik opsional untuk memaksa agen agar hanya menawarkan kunci privat yang cocok +publicKeyRequired=Pemilih kunci +publicKeyRequiredDescription=Kunci publik untuk memaksa agen agar hanya menawarkan kunci privat yang cocok agentKeyName=Pemilih kunci agentKeyNameDescription=Nama entri kunci SSH di agen pengelola kata sandi actions=Tindakan diff --git a/lang/strings/translations_it.properties b/lang/strings/translations_it.properties index 2b69b455e..f3bf34326 100644 --- a/lang/strings/translations_it.properties +++ b/lang/strings/translations_it.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Un socket personalizzato per l'agente SSH sshAgentSocketDescription=Il socket personalizzato da utilizzare per comunicare con l'agente SSH. Questo agente personalizzato può essere utilizzato per una connessione selezionando l'opzione agente personalizzato. publicKey=Selettore di tasti publicKeyDescription=La chiave pubblica opzionale per costringere l'agente a offrire solo la chiave privata corrispondente +publicKeyRequired=Selettore di tasti +publicKeyRequiredDescription=La chiave pubblica per costringere l'agente a offrire solo la chiave privata corrispondente agentKeyName=Selettore di tasti agentKeyNameDescription=Il nome della voce della chiave SSH nell'agente del gestore di password actions=Azioni diff --git a/lang/strings/translations_ja.properties b/lang/strings/translations_ja.properties index 55abc06f9..76477cba1 100644 --- a/lang/strings/translations_ja.properties +++ b/lang/strings/translations_ja.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=カスタムSSHエージェントソケット sshAgentSocketDescription=SSHエージェントとの通信に使用するカスタムソケット。このカスタムエージェントは、カスタムエージェントオプションを選択することで接続に使用できる。 publicKey=キーセレクタ publicKeyDescription=オプションの公開鍵は、エージェントが一致する秘密鍵のみを提供することを強制する。 +publicKeyRequired=キーセレクタ +publicKeyRequiredDescription=エージェントに、一致する秘密鍵のみを提供させるための公開鍵。 agentKeyName=キーセレクタ agentKeyNameDescription=パスワードマネージャーエージェントのSSH鍵エントリの名前 actions=アクション diff --git a/lang/strings/translations_ko.properties b/lang/strings/translations_ko.properties index ce952168d..6c1232d3b 100644 --- a/lang/strings/translations_ko.properties +++ b/lang/strings/translations_ko.properties @@ -1611,6 +1611,8 @@ sshAgentSocket=사용자 지정 SSH 에이전트 소켓 sshAgentSocketDescription=SSH 에이전트와 통신하는 데 사용할 사용자 지정 소켓입니다. 이 사용자 지정 에이전트는 사용자 지정 에이전트 옵션을 선택하여 연결에 사용할 수 있습니다. publicKey=키 선택기 publicKeyDescription=에이전트가 일치하는 개인 키만 제공하도록 하기 위한 선택적 공개 키입니다 +publicKeyRequired=키 선택기 +publicKeyRequiredDescription=상담원이 일치하는 개인 키만 제공하도록 하기 위한 공개 키입니다 agentKeyName=키 선택기 agentKeyNameDescription=비밀번호 관리자 에이전트에 있는 SSH 키 항목의 이름입니다 actions=액션 diff --git a/lang/strings/translations_nl.properties b/lang/strings/translations_nl.properties index 14301123f..1a94c28bd 100644 --- a/lang/strings/translations_nl.properties +++ b/lang/strings/translations_nl.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Aangepaste SSH-agent socket sshAgentSocketDescription=De aangepaste socket om te gebruiken om te communiceren met de SSH agent. Deze aangepaste agent kan worden gebruikt voor een verbinding door de aangepaste agent optie ervoor te selecteren. publicKey=Sleutelselector publicKeyDescription=De optionele publieke sleutel om de agent te dwingen alleen de overeenkomende privésleutel aan te bieden +publicKeyRequired=Sleutelselector +publicKeyRequiredDescription=De publieke sleutel om de agent te dwingen alleen de overeenkomende privésleutel aan te bieden agentKeyName=Sleutelselector agentKeyNameDescription=De naam van de SSH sleutel in de wachtwoordmanager agent actions=Acties diff --git a/lang/strings/translations_pl.properties b/lang/strings/translations_pl.properties index 0412dd974..208feb77c 100644 --- a/lang/strings/translations_pl.properties +++ b/lang/strings/translations_pl.properties @@ -1564,6 +1564,8 @@ sshAgentSocket=Niestandardowe gniazdo agenta SSH sshAgentSocketDescription=Niestandardowe gniazdo używane do komunikacji z agentem SSH. Tego niestandardowego agenta można użyć do połączenia, wybierając dla niego opcję agenta niestandardowego. publicKey=Selektor kluczy publicKeyDescription=Opcjonalny klucz publiczny, aby wymusić na agencie oferowanie tylko pasującego klucza prywatnego +publicKeyRequired=Selektor kluczy +publicKeyRequiredDescription=Klucz publiczny, aby zmusić agenta do oferowania tylko pasującego klucza prywatnego agentKeyName=Selektor kluczy agentKeyNameDescription=Nazwa wpisu klucza SSH w agencie menedżera haseł actions=Działania diff --git a/lang/strings/translations_pt.properties b/lang/strings/translations_pt.properties index acfab2e9f..79c80fd56 100644 --- a/lang/strings/translations_pt.properties +++ b/lang/strings/translations_pt.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Soquete de agente SSH personalizado sshAgentSocketDescription=O socket personalizado a utilizar para comunicar com o agente SSH. Este agente personalizado pode ser utilizado para uma ligação selecionando a opção de agente personalizado para o mesmo. publicKey=Seletor de teclas publicKeyDescription=A chave pública opcional para forçar o agente a oferecer apenas a chave privada correspondente +publicKeyRequired=Seletor de teclas +publicKeyRequiredDescription=A chave pública para forçar o agente a oferecer apenas a chave privada correspondente agentKeyName=Seletor de teclas agentKeyNameDescription=O nome da entrada da chave SSH no agente do gestor de palavras-passe actions=Acções diff --git a/lang/strings/translations_ru.properties b/lang/strings/translations_ru.properties index c0dfba685..b0b5e10f8 100644 --- a/lang/strings/translations_ru.properties +++ b/lang/strings/translations_ru.properties @@ -1675,6 +1675,8 @@ sshAgentSocket=Пользовательский сокет SSH-агента sshAgentSocketDescription=Пользовательский сокет, который будет использоваться для связи с агентом SSH. Этот пользовательский агент можно использовать для соединения, выбрав для него опцию пользовательского агента. publicKey=Селектор клавиш publicKeyDescription=Необязательный открытый ключ, чтобы заставить агента предлагать только подходящий закрытый ключ +publicKeyRequired=Селектор клавиш +publicKeyRequiredDescription=Открытый ключ, чтобы заставить агента предлагать только подходящий закрытый ключ agentKeyName=Селектор клавиш agentKeyNameDescription=Имя записи ключа SSH в агенте менеджера паролей actions=Действия diff --git a/lang/strings/translations_sv.properties b/lang/strings/translations_sv.properties index 5a6bded12..b7d4888c8 100644 --- a/lang/strings/translations_sv.properties +++ b/lang/strings/translations_sv.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Anpassad SSH-agent socket sshAgentSocketDescription=Det anpassade uttaget som ska användas för att kommunicera med SSH-agenten. Den här anpassade agenten kan användas för en anslutning genom att du väljer alternativet anpassad agent för den. publicKey=Nyckelväljare publicKeyDescription=Den valfria publika nyckeln för att tvinga agenten att endast erbjuda den matchande privata nyckeln +publicKeyRequired=Nyckelväljare +publicKeyRequiredDescription=Den publika nyckeln för att tvinga agenten att endast erbjuda den matchande privata nyckeln agentKeyName=Nyckelväljare agentKeyNameDescription=Namnet på SSH-nyckelposten i agenten för lösenordshantering actions=Åtgärder diff --git a/lang/strings/translations_tr.properties b/lang/strings/translations_tr.properties index 6634da295..521eaced8 100644 --- a/lang/strings/translations_tr.properties +++ b/lang/strings/translations_tr.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Özel SSH aracı soketi sshAgentSocketDescription=SSH aracısı ile iletişim kurmak için kullanılacak özel soket. Bu özel aracı, kendisi için özel aracı seçeneği seçilerek bir bağlantı için kullanılabilir. publicKey=Anahtar seçici publicKeyDescription=Aracıları yalnızca eşleşen özel anahtarı sunmaya zorlamak için isteğe bağlı açık anahtar +publicKeyRequired=Anahtar seçici +publicKeyRequiredDescription=Temsilciyi yalnızca eşleşen özel anahtarı sunmaya zorlamak için açık anahtar agentKeyName=Anahtar seçici agentKeyNameDescription=Parola yöneticisi aracısındaki SSH anahtar girişinin adı actions=Eylemler diff --git a/lang/strings/translations_vi.properties b/lang/strings/translations_vi.properties index 73c52d8ec..55674f9aa 100644 --- a/lang/strings/translations_vi.properties +++ b/lang/strings/translations_vi.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=Cổng socket đại lý SSH tùy chỉnh sshAgentSocketDescription=Cổng tùy chỉnh để sử dụng để giao tiếp với trình đại lý SSH. Trình đại lý tùy chỉnh này có thể được sử dụng cho kết nối bằng cách chọn tùy chọn trình đại lý tùy chỉnh cho nó. publicKey=Bộ chọn phím publicKeyDescription=Khóa công khai tùy chọn để buộc đại lý chỉ cung cấp khóa riêng tư khớp +publicKeyRequired=Bộ chọn phím +publicKeyRequiredDescription=Khóa công khai để buộc tác nhân chỉ cung cấp khóa riêng tư phù hợp agentKeyName=Bộ chọn phím agentKeyNameDescription=Tên mục khóa SSH trong trình quản lý mật khẩu actions=Các thao tác diff --git a/lang/strings/translations_zh-Hans.properties b/lang/strings/translations_zh-Hans.properties index 7feda26cd..19b07c88d 100644 --- a/lang/strings/translations_zh-Hans.properties +++ b/lang/strings/translations_zh-Hans.properties @@ -2159,6 +2159,8 @@ sshAgentSocketDescription=用于与 SSH 代理通信的自定义套接字。在 publicKey=公钥标识 #custom publicKeyDescription=指定的可选公钥；填写后将强制 Agent 仅提供与其匹配的私钥。 +publicKeyRequired=按键选择器 +publicKeyRequiredDescription=强制代理只提供匹配私钥的公钥 agentKeyName=按键选择器 agentKeyNameDescription=密码管理器代理中 SSH 密钥条目的名称 actions=行动 diff --git a/lang/strings/translations_zh-Hant.properties b/lang/strings/translations_zh-Hant.properties index e134c077f..f4759db50 100644 --- a/lang/strings/translations_zh-Hant.properties +++ b/lang/strings/translations_zh-Hant.properties @@ -1563,6 +1563,8 @@ sshAgentSocket=自訂 SSH 代理插座 sshAgentSocketDescription=用於與 SSH 代理通訊的自訂套接字。選擇此自訂代理選項，即可將此自訂代理用於連線。 publicKey=按鍵選擇器 publicKeyDescription=可選的公開金鑰，強制代理只提供匹配的私人金鑰 +publicKeyRequired=按鍵選擇器 +publicKeyRequiredDescription=強制代理只提供匹配的私密金鑰的公開金鑰 agentKeyName=按鍵選擇器 agentKeyNameDescription=密碼管理員代理中的 SSH 金鑰項目名稱 actions=行動