Hexor/OutFleet
1
0
Fork 0
mirror of https://github.com/house-of-vanity/OutFleet.git synced 2025-07-07 01:24:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from Sanapach/master

Browse Source 
fix sync&key bugs
This commit is contained in:
Alexandr Bogomyakov
2024-02-18 16:59:08 +02:00
committed by GitHub
parent 01d1ad41aa a2f7c09d09
commit b1cd12a0ab
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib.py
View File

@ -64,7 +64,7 @@ class Server:
# Looking for any users with provided name. len(result) != 1 is a problem. # Looking for any users with provided name. len(result) != 1 is a problem.
result = [] result = []
for key in self.client.get_keys(): for key in self.client.get_keys():
if key.name == name: if key.key_id == name:
result.append(name) result.append(name)
self.log.info(f"check_client found client `{name}` config is correct.") self.log.info(f"check_client found client `{name}` config is correct.")
if len(result) != 1: if len(result) != 1:

2
main.py
View File

@ -305,7 +305,7 @@ def dynamic(server_name, client_id):
(item for item in SERVERS if item.info()["name"] == server_name), None (item for item in SERVERS if item.info()["name"] == server_name), None
) )
key = next( key = next(
(item for item in server.data["keys"] if item.name == client["name"]), None (item for item in server.data["keys"] if item.key_id == client["name"]), None
) )
if server and client and key: if server and client and key:
if server.data["local_server_id"] in client["servers"]: if server.data["local_server_id"] in client["servers"]:

6
templates/clients.html
View File

@ -108,7 +108,7 @@ Same keys will work simultaneously on many devices.
{% if server.info()['local_server_id'] in client['servers'] %} {% if server.info()['local_server_id'] in client['servers'] %}
{{server.info()['name']}} {{server.info()['name']}}
```{% for key in server.data["keys"] %}{% if key.name == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}``` ```{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}```
{% endif %} {% endif %}
{%- endfor -%}</textarea> {%- endfor -%}</textarea>
</div> </div>
@ -129,7 +129,7 @@ Same keys will work simultaneously on many devices.
<tr> <tr>
<td>{{ server.info()['name'] }}</td> <td>{{ server.info()['name'] }}</td>
<td> <td>
<p style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.name == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p> <p style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@ -152,7 +152,7 @@ Same keys will work simultaneously on many devices.
<tr> <tr>
<td>{{ server.info()['name'] }}</td> <td>{{ server.info()['name'] }}</td>
<td> <td>
<pre style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.name == client['name'] %}{{ key.access_url }}{% endif %}{% endfor %}</pre> <pre style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}{{ key.access_url }}{% endif %}{% endfor %}</pre>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}