mirror of
				https://github.com/yuezk/GlobalProtect-openconnect.git
				synced 2025-05-20 07:26:58 -04:00 
			
		
		
		
	upgrade gpauth
This commit is contained in:
		
							
								
								
									
										49
									
								
								crates/auth/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								crates/auth/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,49 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "auth"
 | 
			
		||||
rust-version.workspace = true
 | 
			
		||||
version.workspace = true
 | 
			
		||||
authors.workspace = true
 | 
			
		||||
homepage.workspace = true
 | 
			
		||||
edition.workspace = true
 | 
			
		||||
license.workspace = true
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
gpapi = { path = "../gpapi" }
 | 
			
		||||
 | 
			
		||||
# Shared dependencies
 | 
			
		||||
anyhow.workspace = true
 | 
			
		||||
log.workspace = true
 | 
			
		||||
tokio.workspace = true
 | 
			
		||||
 | 
			
		||||
# Browser auth dependencies
 | 
			
		||||
webbrowser = { version = "1", optional = true }
 | 
			
		||||
open = { version = "5", optional = true }
 | 
			
		||||
which = { workspace = true, optional = true }
 | 
			
		||||
tiny_http = { version = "0.12", optional = true }
 | 
			
		||||
uuid = { version = "1", optional = true, features = ["v4"] }
 | 
			
		||||
 | 
			
		||||
# Webview auth dependencies
 | 
			
		||||
tauri = { workspace = true, optional = true }
 | 
			
		||||
regex = { workspace = true, optional = true }
 | 
			
		||||
tokio-util = { workspace = true, optional = true }
 | 
			
		||||
html-escape = { version = "0.2.13", optional = true }
 | 
			
		||||
 | 
			
		||||
[target.'cfg(not(target_os = "macos"))'.dependencies]
 | 
			
		||||
webkit2gtk = { version = "2", optional = true }
 | 
			
		||||
 | 
			
		||||
[features]
 | 
			
		||||
browser-auth = [
 | 
			
		||||
  "dep:webbrowser",
 | 
			
		||||
  "dep:open",
 | 
			
		||||
  "dep:which",
 | 
			
		||||
  "dep:tiny_http",
 | 
			
		||||
  "dep:uuid",
 | 
			
		||||
]
 | 
			
		||||
webview-auth = [
 | 
			
		||||
  "dep:tauri",
 | 
			
		||||
  "dep:regex",
 | 
			
		||||
  "dep:tokio-util",
 | 
			
		||||
  "dep:html-escape",
 | 
			
		||||
  "dep:webkit2gtk",
 | 
			
		||||
  "gpapi/tauri",
 | 
			
		||||
]
 | 
			
		||||
							
								
								
									
										674
									
								
								crates/auth/LICENSE
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										674
									
								
								crates/auth/LICENSE
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,674 @@
 | 
			
		||||
                    GNU GENERAL PUBLIC LICENSE
 | 
			
		||||
                       Version 3, 29 June 2007
 | 
			
		||||
 | 
			
		||||
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 | 
			
		||||
 Everyone is permitted to copy and distribute verbatim copies
 | 
			
		||||
 of this license document, but changing it is not allowed.
 | 
			
		||||
 | 
			
		||||
                            Preamble
 | 
			
		||||
 | 
			
		||||
  The GNU General Public License is a free, copyleft license for
 | 
			
		||||
software and other kinds of works.
 | 
			
		||||
 | 
			
		||||
  The licenses for most software and other practical works are designed
 | 
			
		||||
to take away your freedom to share and change the works.  By contrast,
 | 
			
		||||
the GNU General Public License is intended to guarantee your freedom to
 | 
			
		||||
share and change all versions of a program--to make sure it remains free
 | 
			
		||||
software for all its users.  We, the Free Software Foundation, use the
 | 
			
		||||
GNU General Public License for most of our software; it applies also to
 | 
			
		||||
any other work released this way by its authors.  You can apply it to
 | 
			
		||||
your programs, too.
 | 
			
		||||
 | 
			
		||||
  When we speak of free software, we are referring to freedom, not
 | 
			
		||||
price.  Our General Public Licenses are designed to make sure that you
 | 
			
		||||
have the freedom to distribute copies of free software (and charge for
 | 
			
		||||
them if you wish), that you receive source code or can get it if you
 | 
			
		||||
want it, that you can change the software or use pieces of it in new
 | 
			
		||||
free programs, and that you know you can do these things.
 | 
			
		||||
 | 
			
		||||
  To protect your rights, we need to prevent others from denying you
 | 
			
		||||
these rights or asking you to surrender the rights.  Therefore, you have
 | 
			
		||||
certain responsibilities if you distribute copies of the software, or if
 | 
			
		||||
you modify it: responsibilities to respect the freedom of others.
 | 
			
		||||
 | 
			
		||||
  For example, if you distribute copies of such a program, whether
 | 
			
		||||
gratis or for a fee, you must pass on to the recipients the same
 | 
			
		||||
freedoms that you received.  You must make sure that they, too, receive
 | 
			
		||||
or can get the source code.  And you must show them these terms so they
 | 
			
		||||
know their rights.
 | 
			
		||||
 | 
			
		||||
  Developers that use the GNU GPL protect your rights with two steps:
 | 
			
		||||
(1) assert copyright on the software, and (2) offer you this License
 | 
			
		||||
giving you legal permission to copy, distribute and/or modify it.
 | 
			
		||||
 | 
			
		||||
  For the developers' and authors' protection, the GPL clearly explains
 | 
			
		||||
that there is no warranty for this free software.  For both users' and
 | 
			
		||||
authors' sake, the GPL requires that modified versions be marked as
 | 
			
		||||
changed, so that their problems will not be attributed erroneously to
 | 
			
		||||
authors of previous versions.
 | 
			
		||||
 | 
			
		||||
  Some devices are designed to deny users access to install or run
 | 
			
		||||
modified versions of the software inside them, although the manufacturer
 | 
			
		||||
can do so.  This is fundamentally incompatible with the aim of
 | 
			
		||||
protecting users' freedom to change the software.  The systematic
 | 
			
		||||
pattern of such abuse occurs in the area of products for individuals to
 | 
			
		||||
use, which is precisely where it is most unacceptable.  Therefore, we
 | 
			
		||||
have designed this version of the GPL to prohibit the practice for those
 | 
			
		||||
products.  If such problems arise substantially in other domains, we
 | 
			
		||||
stand ready to extend this provision to those domains in future versions
 | 
			
		||||
of the GPL, as needed to protect the freedom of users.
 | 
			
		||||
 | 
			
		||||
  Finally, every program is threatened constantly by software patents.
 | 
			
		||||
States should not allow patents to restrict development and use of
 | 
			
		||||
software on general-purpose computers, but in those that do, we wish to
 | 
			
		||||
avoid the special danger that patents applied to a free program could
 | 
			
		||||
make it effectively proprietary.  To prevent this, the GPL assures that
 | 
			
		||||
patents cannot be used to render the program non-free.
 | 
			
		||||
 | 
			
		||||
  The precise terms and conditions for copying, distribution and
 | 
			
		||||
modification follow.
 | 
			
		||||
 | 
			
		||||
                       TERMS AND CONDITIONS
 | 
			
		||||
 | 
			
		||||
  0. Definitions.
 | 
			
		||||
 | 
			
		||||
  "This License" refers to version 3 of the GNU General Public License.
 | 
			
		||||
 | 
			
		||||
  "Copyright" also means copyright-like laws that apply to other kinds of
 | 
			
		||||
works, such as semiconductor masks.
 | 
			
		||||
 | 
			
		||||
  "The Program" refers to any copyrightable work licensed under this
 | 
			
		||||
License.  Each licensee is addressed as "you".  "Licensees" and
 | 
			
		||||
"recipients" may be individuals or organizations.
 | 
			
		||||
 | 
			
		||||
  To "modify" a work means to copy from or adapt all or part of the work
 | 
			
		||||
in a fashion requiring copyright permission, other than the making of an
 | 
			
		||||
exact copy.  The resulting work is called a "modified version" of the
 | 
			
		||||
earlier work or a work "based on" the earlier work.
 | 
			
		||||
 | 
			
		||||
  A "covered work" means either the unmodified Program or a work based
 | 
			
		||||
on the Program.
 | 
			
		||||
 | 
			
		||||
  To "propagate" a work means to do anything with it that, without
 | 
			
		||||
permission, would make you directly or secondarily liable for
 | 
			
		||||
infringement under applicable copyright law, except executing it on a
 | 
			
		||||
computer or modifying a private copy.  Propagation includes copying,
 | 
			
		||||
distribution (with or without modification), making available to the
 | 
			
		||||
public, and in some countries other activities as well.
 | 
			
		||||
 | 
			
		||||
  To "convey" a work means any kind of propagation that enables other
 | 
			
		||||
parties to make or receive copies.  Mere interaction with a user through
 | 
			
		||||
a computer network, with no transfer of a copy, is not conveying.
 | 
			
		||||
 | 
			
		||||
  An interactive user interface displays "Appropriate Legal Notices"
 | 
			
		||||
to the extent that it includes a convenient and prominently visible
 | 
			
		||||
feature that (1) displays an appropriate copyright notice, and (2)
 | 
			
		||||
tells the user that there is no warranty for the work (except to the
 | 
			
		||||
extent that warranties are provided), that licensees may convey the
 | 
			
		||||
work under this License, and how to view a copy of this License.  If
 | 
			
		||||
the interface presents a list of user commands or options, such as a
 | 
			
		||||
menu, a prominent item in the list meets this criterion.
 | 
			
		||||
 | 
			
		||||
  1. Source Code.
 | 
			
		||||
 | 
			
		||||
  The "source code" for a work means the preferred form of the work
 | 
			
		||||
for making modifications to it.  "Object code" means any non-source
 | 
			
		||||
form of a work.
 | 
			
		||||
 | 
			
		||||
  A "Standard Interface" means an interface that either is an official
 | 
			
		||||
standard defined by a recognized standards body, or, in the case of
 | 
			
		||||
interfaces specified for a particular programming language, one that
 | 
			
		||||
is widely used among developers working in that language.
 | 
			
		||||
 | 
			
		||||
  The "System Libraries" of an executable work include anything, other
 | 
			
		||||
than the work as a whole, that (a) is included in the normal form of
 | 
			
		||||
packaging a Major Component, but which is not part of that Major
 | 
			
		||||
Component, and (b) serves only to enable use of the work with that
 | 
			
		||||
Major Component, or to implement a Standard Interface for which an
 | 
			
		||||
implementation is available to the public in source code form.  A
 | 
			
		||||
"Major Component", in this context, means a major essential component
 | 
			
		||||
(kernel, window system, and so on) of the specific operating system
 | 
			
		||||
(if any) on which the executable work runs, or a compiler used to
 | 
			
		||||
produce the work, or an object code interpreter used to run it.
 | 
			
		||||
 | 
			
		||||
  The "Corresponding Source" for a work in object code form means all
 | 
			
		||||
the source code needed to generate, install, and (for an executable
 | 
			
		||||
work) run the object code and to modify the work, including scripts to
 | 
			
		||||
control those activities.  However, it does not include the work's
 | 
			
		||||
System Libraries, or general-purpose tools or generally available free
 | 
			
		||||
programs which are used unmodified in performing those activities but
 | 
			
		||||
which are not part of the work.  For example, Corresponding Source
 | 
			
		||||
includes interface definition files associated with source files for
 | 
			
		||||
the work, and the source code for shared libraries and dynamically
 | 
			
		||||
linked subprograms that the work is specifically designed to require,
 | 
			
		||||
such as by intimate data communication or control flow between those
 | 
			
		||||
subprograms and other parts of the work.
 | 
			
		||||
 | 
			
		||||
  The Corresponding Source need not include anything that users
 | 
			
		||||
can regenerate automatically from other parts of the Corresponding
 | 
			
		||||
Source.
 | 
			
		||||
 | 
			
		||||
  The Corresponding Source for a work in source code form is that
 | 
			
		||||
same work.
 | 
			
		||||
 | 
			
		||||
  2. Basic Permissions.
 | 
			
		||||
 | 
			
		||||
  All rights granted under this License are granted for the term of
 | 
			
		||||
copyright on the Program, and are irrevocable provided the stated
 | 
			
		||||
conditions are met.  This License explicitly affirms your unlimited
 | 
			
		||||
permission to run the unmodified Program.  The output from running a
 | 
			
		||||
covered work is covered by this License only if the output, given its
 | 
			
		||||
content, constitutes a covered work.  This License acknowledges your
 | 
			
		||||
rights of fair use or other equivalent, as provided by copyright law.
 | 
			
		||||
 | 
			
		||||
  You may make, run and propagate covered works that you do not
 | 
			
		||||
convey, without conditions so long as your license otherwise remains
 | 
			
		||||
in force.  You may convey covered works to others for the sole purpose
 | 
			
		||||
of having them make modifications exclusively for you, or provide you
 | 
			
		||||
with facilities for running those works, provided that you comply with
 | 
			
		||||
the terms of this License in conveying all material for which you do
 | 
			
		||||
not control copyright.  Those thus making or running the covered works
 | 
			
		||||
for you must do so exclusively on your behalf, under your direction
 | 
			
		||||
and control, on terms that prohibit them from making any copies of
 | 
			
		||||
your copyrighted material outside their relationship with you.
 | 
			
		||||
 | 
			
		||||
  Conveying under any other circumstances is permitted solely under
 | 
			
		||||
the conditions stated below.  Sublicensing is not allowed; section 10
 | 
			
		||||
makes it unnecessary.
 | 
			
		||||
 | 
			
		||||
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 | 
			
		||||
 | 
			
		||||
  No covered work shall be deemed part of an effective technological
 | 
			
		||||
measure under any applicable law fulfilling obligations under article
 | 
			
		||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
 | 
			
		||||
similar laws prohibiting or restricting circumvention of such
 | 
			
		||||
measures.
 | 
			
		||||
 | 
			
		||||
  When you convey a covered work, you waive any legal power to forbid
 | 
			
		||||
circumvention of technological measures to the extent such circumvention
 | 
			
		||||
is effected by exercising rights under this License with respect to
 | 
			
		||||
the covered work, and you disclaim any intention to limit operation or
 | 
			
		||||
modification of the work as a means of enforcing, against the work's
 | 
			
		||||
users, your or third parties' legal rights to forbid circumvention of
 | 
			
		||||
technological measures.
 | 
			
		||||
 | 
			
		||||
  4. Conveying Verbatim Copies.
 | 
			
		||||
 | 
			
		||||
  You may convey verbatim copies of the Program's source code as you
 | 
			
		||||
receive it, in any medium, provided that you conspicuously and
 | 
			
		||||
appropriately publish on each copy an appropriate copyright notice;
 | 
			
		||||
keep intact all notices stating that this License and any
 | 
			
		||||
non-permissive terms added in accord with section 7 apply to the code;
 | 
			
		||||
keep intact all notices of the absence of any warranty; and give all
 | 
			
		||||
recipients a copy of this License along with the Program.
 | 
			
		||||
 | 
			
		||||
  You may charge any price or no price for each copy that you convey,
 | 
			
		||||
and you may offer support or warranty protection for a fee.
 | 
			
		||||
 | 
			
		||||
  5. Conveying Modified Source Versions.
 | 
			
		||||
 | 
			
		||||
  You may convey a work based on the Program, or the modifications to
 | 
			
		||||
produce it from the Program, in the form of source code under the
 | 
			
		||||
terms of section 4, provided that you also meet all of these conditions:
 | 
			
		||||
 | 
			
		||||
    a) The work must carry prominent notices stating that you modified
 | 
			
		||||
    it, and giving a relevant date.
 | 
			
		||||
 | 
			
		||||
    b) The work must carry prominent notices stating that it is
 | 
			
		||||
    released under this License and any conditions added under section
 | 
			
		||||
    7.  This requirement modifies the requirement in section 4 to
 | 
			
		||||
    "keep intact all notices".
 | 
			
		||||
 | 
			
		||||
    c) You must license the entire work, as a whole, under this
 | 
			
		||||
    License to anyone who comes into possession of a copy.  This
 | 
			
		||||
    License will therefore apply, along with any applicable section 7
 | 
			
		||||
    additional terms, to the whole of the work, and all its parts,
 | 
			
		||||
    regardless of how they are packaged.  This License gives no
 | 
			
		||||
    permission to license the work in any other way, but it does not
 | 
			
		||||
    invalidate such permission if you have separately received it.
 | 
			
		||||
 | 
			
		||||
    d) If the work has interactive user interfaces, each must display
 | 
			
		||||
    Appropriate Legal Notices; however, if the Program has interactive
 | 
			
		||||
    interfaces that do not display Appropriate Legal Notices, your
 | 
			
		||||
    work need not make them do so.
 | 
			
		||||
 | 
			
		||||
  A compilation of a covered work with other separate and independent
 | 
			
		||||
works, which are not by their nature extensions of the covered work,
 | 
			
		||||
and which are not combined with it such as to form a larger program,
 | 
			
		||||
in or on a volume of a storage or distribution medium, is called an
 | 
			
		||||
"aggregate" if the compilation and its resulting copyright are not
 | 
			
		||||
used to limit the access or legal rights of the compilation's users
 | 
			
		||||
beyond what the individual works permit.  Inclusion of a covered work
 | 
			
		||||
in an aggregate does not cause this License to apply to the other
 | 
			
		||||
parts of the aggregate.
 | 
			
		||||
 | 
			
		||||
  6. Conveying Non-Source Forms.
 | 
			
		||||
 | 
			
		||||
  You may convey a covered work in object code form under the terms
 | 
			
		||||
of sections 4 and 5, provided that you also convey the
 | 
			
		||||
machine-readable Corresponding Source under the terms of this License,
 | 
			
		||||
in one of these ways:
 | 
			
		||||
 | 
			
		||||
    a) Convey the object code in, or embodied in, a physical product
 | 
			
		||||
    (including a physical distribution medium), accompanied by the
 | 
			
		||||
    Corresponding Source fixed on a durable physical medium
 | 
			
		||||
    customarily used for software interchange.
 | 
			
		||||
 | 
			
		||||
    b) Convey the object code in, or embodied in, a physical product
 | 
			
		||||
    (including a physical distribution medium), accompanied by a
 | 
			
		||||
    written offer, valid for at least three years and valid for as
 | 
			
		||||
    long as you offer spare parts or customer support for that product
 | 
			
		||||
    model, to give anyone who possesses the object code either (1) a
 | 
			
		||||
    copy of the Corresponding Source for all the software in the
 | 
			
		||||
    product that is covered by this License, on a durable physical
 | 
			
		||||
    medium customarily used for software interchange, for a price no
 | 
			
		||||
    more than your reasonable cost of physically performing this
 | 
			
		||||
    conveying of source, or (2) access to copy the
 | 
			
		||||
    Corresponding Source from a network server at no charge.
 | 
			
		||||
 | 
			
		||||
    c) Convey individual copies of the object code with a copy of the
 | 
			
		||||
    written offer to provide the Corresponding Source.  This
 | 
			
		||||
    alternative is allowed only occasionally and noncommercially, and
 | 
			
		||||
    only if you received the object code with such an offer, in accord
 | 
			
		||||
    with subsection 6b.
 | 
			
		||||
 | 
			
		||||
    d) Convey the object code by offering access from a designated
 | 
			
		||||
    place (gratis or for a charge), and offer equivalent access to the
 | 
			
		||||
    Corresponding Source in the same way through the same place at no
 | 
			
		||||
    further charge.  You need not require recipients to copy the
 | 
			
		||||
    Corresponding Source along with the object code.  If the place to
 | 
			
		||||
    copy the object code is a network server, the Corresponding Source
 | 
			
		||||
    may be on a different server (operated by you or a third party)
 | 
			
		||||
    that supports equivalent copying facilities, provided you maintain
 | 
			
		||||
    clear directions next to the object code saying where to find the
 | 
			
		||||
    Corresponding Source.  Regardless of what server hosts the
 | 
			
		||||
    Corresponding Source, you remain obligated to ensure that it is
 | 
			
		||||
    available for as long as needed to satisfy these requirements.
 | 
			
		||||
 | 
			
		||||
    e) Convey the object code using peer-to-peer transmission, provided
 | 
			
		||||
    you inform other peers where the object code and Corresponding
 | 
			
		||||
    Source of the work are being offered to the general public at no
 | 
			
		||||
    charge under subsection 6d.
 | 
			
		||||
 | 
			
		||||
  A separable portion of the object code, whose source code is excluded
 | 
			
		||||
from the Corresponding Source as a System Library, need not be
 | 
			
		||||
included in conveying the object code work.
 | 
			
		||||
 | 
			
		||||
  A "User Product" is either (1) a "consumer product", which means any
 | 
			
		||||
tangible personal property which is normally used for personal, family,
 | 
			
		||||
or household purposes, or (2) anything designed or sold for incorporation
 | 
			
		||||
into a dwelling.  In determining whether a product is a consumer product,
 | 
			
		||||
doubtful cases shall be resolved in favor of coverage.  For a particular
 | 
			
		||||
product received by a particular user, "normally used" refers to a
 | 
			
		||||
typical or common use of that class of product, regardless of the status
 | 
			
		||||
of the particular user or of the way in which the particular user
 | 
			
		||||
actually uses, or expects or is expected to use, the product.  A product
 | 
			
		||||
is a consumer product regardless of whether the product has substantial
 | 
			
		||||
commercial, industrial or non-consumer uses, unless such uses represent
 | 
			
		||||
the only significant mode of use of the product.
 | 
			
		||||
 | 
			
		||||
  "Installation Information" for a User Product means any methods,
 | 
			
		||||
procedures, authorization keys, or other information required to install
 | 
			
		||||
and execute modified versions of a covered work in that User Product from
 | 
			
		||||
a modified version of its Corresponding Source.  The information must
 | 
			
		||||
suffice to ensure that the continued functioning of the modified object
 | 
			
		||||
code is in no case prevented or interfered with solely because
 | 
			
		||||
modification has been made.
 | 
			
		||||
 | 
			
		||||
  If you convey an object code work under this section in, or with, or
 | 
			
		||||
specifically for use in, a User Product, and the conveying occurs as
 | 
			
		||||
part of a transaction in which the right of possession and use of the
 | 
			
		||||
User Product is transferred to the recipient in perpetuity or for a
 | 
			
		||||
fixed term (regardless of how the transaction is characterized), the
 | 
			
		||||
Corresponding Source conveyed under this section must be accompanied
 | 
			
		||||
by the Installation Information.  But this requirement does not apply
 | 
			
		||||
if neither you nor any third party retains the ability to install
 | 
			
		||||
modified object code on the User Product (for example, the work has
 | 
			
		||||
been installed in ROM).
 | 
			
		||||
 | 
			
		||||
  The requirement to provide Installation Information does not include a
 | 
			
		||||
requirement to continue to provide support service, warranty, or updates
 | 
			
		||||
for a work that has been modified or installed by the recipient, or for
 | 
			
		||||
the User Product in which it has been modified or installed.  Access to a
 | 
			
		||||
network may be denied when the modification itself materially and
 | 
			
		||||
adversely affects the operation of the network or violates the rules and
 | 
			
		||||
protocols for communication across the network.
 | 
			
		||||
 | 
			
		||||
  Corresponding Source conveyed, and Installation Information provided,
 | 
			
		||||
in accord with this section must be in a format that is publicly
 | 
			
		||||
documented (and with an implementation available to the public in
 | 
			
		||||
source code form), and must require no special password or key for
 | 
			
		||||
unpacking, reading or copying.
 | 
			
		||||
 | 
			
		||||
  7. Additional Terms.
 | 
			
		||||
 | 
			
		||||
  "Additional permissions" are terms that supplement the terms of this
 | 
			
		||||
License by making exceptions from one or more of its conditions.
 | 
			
		||||
Additional permissions that are applicable to the entire Program shall
 | 
			
		||||
be treated as though they were included in this License, to the extent
 | 
			
		||||
that they are valid under applicable law.  If additional permissions
 | 
			
		||||
apply only to part of the Program, that part may be used separately
 | 
			
		||||
under those permissions, but the entire Program remains governed by
 | 
			
		||||
this License without regard to the additional permissions.
 | 
			
		||||
 | 
			
		||||
  When you convey a copy of a covered work, you may at your option
 | 
			
		||||
remove any additional permissions from that copy, or from any part of
 | 
			
		||||
it.  (Additional permissions may be written to require their own
 | 
			
		||||
removal in certain cases when you modify the work.)  You may place
 | 
			
		||||
additional permissions on material, added by you to a covered work,
 | 
			
		||||
for which you have or can give appropriate copyright permission.
 | 
			
		||||
 | 
			
		||||
  Notwithstanding any other provision of this License, for material you
 | 
			
		||||
add to a covered work, you may (if authorized by the copyright holders of
 | 
			
		||||
that material) supplement the terms of this License with terms:
 | 
			
		||||
 | 
			
		||||
    a) Disclaiming warranty or limiting liability differently from the
 | 
			
		||||
    terms of sections 15 and 16 of this License; or
 | 
			
		||||
 | 
			
		||||
    b) Requiring preservation of specified reasonable legal notices or
 | 
			
		||||
    author attributions in that material or in the Appropriate Legal
 | 
			
		||||
    Notices displayed by works containing it; or
 | 
			
		||||
 | 
			
		||||
    c) Prohibiting misrepresentation of the origin of that material, or
 | 
			
		||||
    requiring that modified versions of such material be marked in
 | 
			
		||||
    reasonable ways as different from the original version; or
 | 
			
		||||
 | 
			
		||||
    d) Limiting the use for publicity purposes of names of licensors or
 | 
			
		||||
    authors of the material; or
 | 
			
		||||
 | 
			
		||||
    e) Declining to grant rights under trademark law for use of some
 | 
			
		||||
    trade names, trademarks, or service marks; or
 | 
			
		||||
 | 
			
		||||
    f) Requiring indemnification of licensors and authors of that
 | 
			
		||||
    material by anyone who conveys the material (or modified versions of
 | 
			
		||||
    it) with contractual assumptions of liability to the recipient, for
 | 
			
		||||
    any liability that these contractual assumptions directly impose on
 | 
			
		||||
    those licensors and authors.
 | 
			
		||||
 | 
			
		||||
  All other non-permissive additional terms are considered "further
 | 
			
		||||
restrictions" within the meaning of section 10.  If the Program as you
 | 
			
		||||
received it, or any part of it, contains a notice stating that it is
 | 
			
		||||
governed by this License along with a term that is a further
 | 
			
		||||
restriction, you may remove that term.  If a license document contains
 | 
			
		||||
a further restriction but permits relicensing or conveying under this
 | 
			
		||||
License, you may add to a covered work material governed by the terms
 | 
			
		||||
of that license document, provided that the further restriction does
 | 
			
		||||
not survive such relicensing or conveying.
 | 
			
		||||
 | 
			
		||||
  If you add terms to a covered work in accord with this section, you
 | 
			
		||||
must place, in the relevant source files, a statement of the
 | 
			
		||||
additional terms that apply to those files, or a notice indicating
 | 
			
		||||
where to find the applicable terms.
 | 
			
		||||
 | 
			
		||||
  Additional terms, permissive or non-permissive, may be stated in the
 | 
			
		||||
form of a separately written license, or stated as exceptions;
 | 
			
		||||
the above requirements apply either way.
 | 
			
		||||
 | 
			
		||||
  8. Termination.
 | 
			
		||||
 | 
			
		||||
  You may not propagate or modify a covered work except as expressly
 | 
			
		||||
provided under this License.  Any attempt otherwise to propagate or
 | 
			
		||||
modify it is void, and will automatically terminate your rights under
 | 
			
		||||
this License (including any patent licenses granted under the third
 | 
			
		||||
paragraph of section 11).
 | 
			
		||||
 | 
			
		||||
  However, if you cease all violation of this License, then your
 | 
			
		||||
license from a particular copyright holder is reinstated (a)
 | 
			
		||||
provisionally, unless and until the copyright holder explicitly and
 | 
			
		||||
finally terminates your license, and (b) permanently, if the copyright
 | 
			
		||||
holder fails to notify you of the violation by some reasonable means
 | 
			
		||||
prior to 60 days after the cessation.
 | 
			
		||||
 | 
			
		||||
  Moreover, your license from a particular copyright holder is
 | 
			
		||||
reinstated permanently if the copyright holder notifies you of the
 | 
			
		||||
violation by some reasonable means, this is the first time you have
 | 
			
		||||
received notice of violation of this License (for any work) from that
 | 
			
		||||
copyright holder, and you cure the violation prior to 30 days after
 | 
			
		||||
your receipt of the notice.
 | 
			
		||||
 | 
			
		||||
  Termination of your rights under this section does not terminate the
 | 
			
		||||
licenses of parties who have received copies or rights from you under
 | 
			
		||||
this License.  If your rights have been terminated and not permanently
 | 
			
		||||
reinstated, you do not qualify to receive new licenses for the same
 | 
			
		||||
material under section 10.
 | 
			
		||||
 | 
			
		||||
  9. Acceptance Not Required for Having Copies.
 | 
			
		||||
 | 
			
		||||
  You are not required to accept this License in order to receive or
 | 
			
		||||
run a copy of the Program.  Ancillary propagation of a covered work
 | 
			
		||||
occurring solely as a consequence of using peer-to-peer transmission
 | 
			
		||||
to receive a copy likewise does not require acceptance.  However,
 | 
			
		||||
nothing other than this License grants you permission to propagate or
 | 
			
		||||
modify any covered work.  These actions infringe copyright if you do
 | 
			
		||||
not accept this License.  Therefore, by modifying or propagating a
 | 
			
		||||
covered work, you indicate your acceptance of this License to do so.
 | 
			
		||||
 | 
			
		||||
  10. Automatic Licensing of Downstream Recipients.
 | 
			
		||||
 | 
			
		||||
  Each time you convey a covered work, the recipient automatically
 | 
			
		||||
receives a license from the original licensors, to run, modify and
 | 
			
		||||
propagate that work, subject to this License.  You are not responsible
 | 
			
		||||
for enforcing compliance by third parties with this License.
 | 
			
		||||
 | 
			
		||||
  An "entity transaction" is a transaction transferring control of an
 | 
			
		||||
organization, or substantially all assets of one, or subdividing an
 | 
			
		||||
organization, or merging organizations.  If propagation of a covered
 | 
			
		||||
work results from an entity transaction, each party to that
 | 
			
		||||
transaction who receives a copy of the work also receives whatever
 | 
			
		||||
licenses to the work the party's predecessor in interest had or could
 | 
			
		||||
give under the previous paragraph, plus a right to possession of the
 | 
			
		||||
Corresponding Source of the work from the predecessor in interest, if
 | 
			
		||||
the predecessor has it or can get it with reasonable efforts.
 | 
			
		||||
 | 
			
		||||
  You may not impose any further restrictions on the exercise of the
 | 
			
		||||
rights granted or affirmed under this License.  For example, you may
 | 
			
		||||
not impose a license fee, royalty, or other charge for exercise of
 | 
			
		||||
rights granted under this License, and you may not initiate litigation
 | 
			
		||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
 | 
			
		||||
any patent claim is infringed by making, using, selling, offering for
 | 
			
		||||
sale, or importing the Program or any portion of it.
 | 
			
		||||
 | 
			
		||||
  11. Patents.
 | 
			
		||||
 | 
			
		||||
  A "contributor" is a copyright holder who authorizes use under this
 | 
			
		||||
License of the Program or a work on which the Program is based.  The
 | 
			
		||||
work thus licensed is called the contributor's "contributor version".
 | 
			
		||||
 | 
			
		||||
  A contributor's "essential patent claims" are all patent claims
 | 
			
		||||
owned or controlled by the contributor, whether already acquired or
 | 
			
		||||
hereafter acquired, that would be infringed by some manner, permitted
 | 
			
		||||
by this License, of making, using, or selling its contributor version,
 | 
			
		||||
but do not include claims that would be infringed only as a
 | 
			
		||||
consequence of further modification of the contributor version.  For
 | 
			
		||||
purposes of this definition, "control" includes the right to grant
 | 
			
		||||
patent sublicenses in a manner consistent with the requirements of
 | 
			
		||||
this License.
 | 
			
		||||
 | 
			
		||||
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 | 
			
		||||
patent license under the contributor's essential patent claims, to
 | 
			
		||||
make, use, sell, offer for sale, import and otherwise run, modify and
 | 
			
		||||
propagate the contents of its contributor version.
 | 
			
		||||
 | 
			
		||||
  In the following three paragraphs, a "patent license" is any express
 | 
			
		||||
agreement or commitment, however denominated, not to enforce a patent
 | 
			
		||||
(such as an express permission to practice a patent or covenant not to
 | 
			
		||||
sue for patent infringement).  To "grant" such a patent license to a
 | 
			
		||||
party means to make such an agreement or commitment not to enforce a
 | 
			
		||||
patent against the party.
 | 
			
		||||
 | 
			
		||||
  If you convey a covered work, knowingly relying on a patent license,
 | 
			
		||||
and the Corresponding Source of the work is not available for anyone
 | 
			
		||||
to copy, free of charge and under the terms of this License, through a
 | 
			
		||||
publicly available network server or other readily accessible means,
 | 
			
		||||
then you must either (1) cause the Corresponding Source to be so
 | 
			
		||||
available, or (2) arrange to deprive yourself of the benefit of the
 | 
			
		||||
patent license for this particular work, or (3) arrange, in a manner
 | 
			
		||||
consistent with the requirements of this License, to extend the patent
 | 
			
		||||
license to downstream recipients.  "Knowingly relying" means you have
 | 
			
		||||
actual knowledge that, but for the patent license, your conveying the
 | 
			
		||||
covered work in a country, or your recipient's use of the covered work
 | 
			
		||||
in a country, would infringe one or more identifiable patents in that
 | 
			
		||||
country that you have reason to believe are valid.
 | 
			
		||||
 | 
			
		||||
  If, pursuant to or in connection with a single transaction or
 | 
			
		||||
arrangement, you convey, or propagate by procuring conveyance of, a
 | 
			
		||||
covered work, and grant a patent license to some of the parties
 | 
			
		||||
receiving the covered work authorizing them to use, propagate, modify
 | 
			
		||||
or convey a specific copy of the covered work, then the patent license
 | 
			
		||||
you grant is automatically extended to all recipients of the covered
 | 
			
		||||
work and works based on it.
 | 
			
		||||
 | 
			
		||||
  A patent license is "discriminatory" if it does not include within
 | 
			
		||||
the scope of its coverage, prohibits the exercise of, or is
 | 
			
		||||
conditioned on the non-exercise of one or more of the rights that are
 | 
			
		||||
specifically granted under this License.  You may not convey a covered
 | 
			
		||||
work if you are a party to an arrangement with a third party that is
 | 
			
		||||
in the business of distributing software, under which you make payment
 | 
			
		||||
to the third party based on the extent of your activity of conveying
 | 
			
		||||
the work, and under which the third party grants, to any of the
 | 
			
		||||
parties who would receive the covered work from you, a discriminatory
 | 
			
		||||
patent license (a) in connection with copies of the covered work
 | 
			
		||||
conveyed by you (or copies made from those copies), or (b) primarily
 | 
			
		||||
for and in connection with specific products or compilations that
 | 
			
		||||
contain the covered work, unless you entered into that arrangement,
 | 
			
		||||
or that patent license was granted, prior to 28 March 2007.
 | 
			
		||||
 | 
			
		||||
  Nothing in this License shall be construed as excluding or limiting
 | 
			
		||||
any implied license or other defenses to infringement that may
 | 
			
		||||
otherwise be available to you under applicable patent law.
 | 
			
		||||
 | 
			
		||||
  12. No Surrender of Others' Freedom.
 | 
			
		||||
 | 
			
		||||
  If conditions are imposed on you (whether by court order, agreement or
 | 
			
		||||
otherwise) that contradict the conditions of this License, they do not
 | 
			
		||||
excuse you from the conditions of this License.  If you cannot convey a
 | 
			
		||||
covered work so as to satisfy simultaneously your obligations under this
 | 
			
		||||
License and any other pertinent obligations, then as a consequence you may
 | 
			
		||||
not convey it at all.  For example, if you agree to terms that obligate you
 | 
			
		||||
to collect a royalty for further conveying from those to whom you convey
 | 
			
		||||
the Program, the only way you could satisfy both those terms and this
 | 
			
		||||
License would be to refrain entirely from conveying the Program.
 | 
			
		||||
 | 
			
		||||
  13. Use with the GNU Affero General Public License.
 | 
			
		||||
 | 
			
		||||
  Notwithstanding any other provision of this License, you have
 | 
			
		||||
permission to link or combine any covered work with a work licensed
 | 
			
		||||
under version 3 of the GNU Affero General Public License into a single
 | 
			
		||||
combined work, and to convey the resulting work.  The terms of this
 | 
			
		||||
License will continue to apply to the part which is the covered work,
 | 
			
		||||
but the special requirements of the GNU Affero General Public License,
 | 
			
		||||
section 13, concerning interaction through a network will apply to the
 | 
			
		||||
combination as such.
 | 
			
		||||
 | 
			
		||||
  14. Revised Versions of this License.
 | 
			
		||||
 | 
			
		||||
  The Free Software Foundation may publish revised and/or new versions of
 | 
			
		||||
the GNU General Public License from time to time.  Such new versions will
 | 
			
		||||
be similar in spirit to the present version, but may differ in detail to
 | 
			
		||||
address new problems or concerns.
 | 
			
		||||
 | 
			
		||||
  Each version is given a distinguishing version number.  If the
 | 
			
		||||
Program specifies that a certain numbered version of the GNU General
 | 
			
		||||
Public License "or any later version" applies to it, you have the
 | 
			
		||||
option of following the terms and conditions either of that numbered
 | 
			
		||||
version or of any later version published by the Free Software
 | 
			
		||||
Foundation.  If the Program does not specify a version number of the
 | 
			
		||||
GNU General Public License, you may choose any version ever published
 | 
			
		||||
by the Free Software Foundation.
 | 
			
		||||
 | 
			
		||||
  If the Program specifies that a proxy can decide which future
 | 
			
		||||
versions of the GNU General Public License can be used, that proxy's
 | 
			
		||||
public statement of acceptance of a version permanently authorizes you
 | 
			
		||||
to choose that version for the Program.
 | 
			
		||||
 | 
			
		||||
  Later license versions may give you additional or different
 | 
			
		||||
permissions.  However, no additional obligations are imposed on any
 | 
			
		||||
author or copyright holder as a result of your choosing to follow a
 | 
			
		||||
later version.
 | 
			
		||||
 | 
			
		||||
  15. Disclaimer of Warranty.
 | 
			
		||||
 | 
			
		||||
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 | 
			
		||||
APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 | 
			
		||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 | 
			
		||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 | 
			
		||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 | 
			
		||||
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 | 
			
		||||
IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 | 
			
		||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 | 
			
		||||
 | 
			
		||||
  16. Limitation of Liability.
 | 
			
		||||
 | 
			
		||||
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 | 
			
		||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 | 
			
		||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 | 
			
		||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 | 
			
		||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 | 
			
		||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 | 
			
		||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 | 
			
		||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 | 
			
		||||
SUCH DAMAGES.
 | 
			
		||||
 | 
			
		||||
  17. Interpretation of Sections 15 and 16.
 | 
			
		||||
 | 
			
		||||
  If the disclaimer of warranty and limitation of liability provided
 | 
			
		||||
above cannot be given local legal effect according to their terms,
 | 
			
		||||
reviewing courts shall apply local law that most closely approximates
 | 
			
		||||
an absolute waiver of all civil liability in connection with the
 | 
			
		||||
Program, unless a warranty or assumption of liability accompanies a
 | 
			
		||||
copy of the Program in return for a fee.
 | 
			
		||||
 | 
			
		||||
                     END OF TERMS AND CONDITIONS
 | 
			
		||||
 | 
			
		||||
            How to Apply These Terms to Your New Programs
 | 
			
		||||
 | 
			
		||||
  If you develop a new program, and you want it to be of the greatest
 | 
			
		||||
possible use to the public, the best way to achieve this is to make it
 | 
			
		||||
free software which everyone can redistribute and change under these terms.
 | 
			
		||||
 | 
			
		||||
  To do so, attach the following notices to the program.  It is safest
 | 
			
		||||
to attach them to the start of each source file to most effectively
 | 
			
		||||
state the exclusion of warranty; and each file should have at least
 | 
			
		||||
the "copyright" line and a pointer to where the full notice is found.
 | 
			
		||||
 | 
			
		||||
    <one line to give the program's name and a brief idea of what it does.>
 | 
			
		||||
    Copyright (C) <year>  <name of author>
 | 
			
		||||
 | 
			
		||||
    This program is free software: you can redistribute it and/or modify
 | 
			
		||||
    it under the terms of the GNU General Public License as published by
 | 
			
		||||
    the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
    (at your option) any later version.
 | 
			
		||||
 | 
			
		||||
    This program is distributed in the hope that it will be useful,
 | 
			
		||||
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
    GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
    You should have received a copy of the GNU General Public License
 | 
			
		||||
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 | 
			
		||||
 | 
			
		||||
Also add information on how to contact you by electronic and paper mail.
 | 
			
		||||
 | 
			
		||||
  If the program does terminal interaction, make it output a short
 | 
			
		||||
notice like this when it starts in an interactive mode:
 | 
			
		||||
 | 
			
		||||
    <program>  Copyright (C) <year>  <name of author>
 | 
			
		||||
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 | 
			
		||||
    This is free software, and you are welcome to redistribute it
 | 
			
		||||
    under certain conditions; type `show c' for details.
 | 
			
		||||
 | 
			
		||||
The hypothetical commands `show w' and `show c' should show the appropriate
 | 
			
		||||
parts of the General Public License.  Of course, your program's commands
 | 
			
		||||
might be different; for a GUI interface, you would use an "about box".
 | 
			
		||||
 | 
			
		||||
  You should also get your employer (if you work as a programmer) or school,
 | 
			
		||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
 | 
			
		||||
For more information on this, and how to apply and follow the GNU GPL, see
 | 
			
		||||
<https://www.gnu.org/licenses/>.
 | 
			
		||||
 | 
			
		||||
  The GNU General Public License does not permit incorporating your program
 | 
			
		||||
into proprietary programs.  If your program is a subroutine library, you
 | 
			
		||||
may consider it more useful to permit linking proprietary applications with
 | 
			
		||||
the library.  If this is what you want to do, use the GNU Lesser General
 | 
			
		||||
Public License instead of this License.  But first, please read
 | 
			
		||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
 | 
			
		||||
							
								
								
									
										60
									
								
								crates/auth/src/auth_window.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								crates/auth/src/auth_window.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,60 @@
 | 
			
		||||
use std::borrow::Cow;
 | 
			
		||||
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use gpapi::{
 | 
			
		||||
  gp_params::GpParams,
 | 
			
		||||
  portal::{prelogin, Prelogin},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
pub struct AuthWindow<'a> {
 | 
			
		||||
  server: &'a str,
 | 
			
		||||
  auth_request: Option<&'a str>,
 | 
			
		||||
  pub(crate) gp_params: &'a GpParams,
 | 
			
		||||
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  pub(crate) clean: bool,
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  pub(crate) is_retrying: tokio::sync::RwLock<bool>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl<'a> AuthWindow<'a> {
 | 
			
		||||
  pub fn new(server: &'a str, gp_params: &'a GpParams) -> Self {
 | 
			
		||||
    Self {
 | 
			
		||||
      server,
 | 
			
		||||
      gp_params,
 | 
			
		||||
      auth_request: None,
 | 
			
		||||
 | 
			
		||||
      #[cfg(feature = "webview-auth")]
 | 
			
		||||
      clean: false,
 | 
			
		||||
      #[cfg(feature = "webview-auth")]
 | 
			
		||||
      is_retrying: Default::default(),
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn with_auth_request(mut self, auth_request: &'a str) -> Self {
 | 
			
		||||
    if !auth_request.is_empty() {
 | 
			
		||||
      self.auth_request = Some(auth_request);
 | 
			
		||||
    }
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub(crate) async fn initial_auth_request(&self) -> anyhow::Result<Cow<'a, str>> {
 | 
			
		||||
    if let Some(auth_request) = self.auth_request {
 | 
			
		||||
      return Ok(Cow::Borrowed(auth_request));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let auth_request = self.portal_prelogin().await?;
 | 
			
		||||
    Ok(Cow::Owned(auth_request))
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub(crate) async fn portal_prelogin(&self) -> anyhow::Result<String> {
 | 
			
		||||
    auth_prelogin(self.server, self.gp_params).await
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub async fn auth_prelogin(server: &str, gp_params: &GpParams) -> anyhow::Result<String> {
 | 
			
		||||
  match prelogin(server, gp_params).await? {
 | 
			
		||||
    Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
 | 
			
		||||
    Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								crates/auth/src/browser_auth.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								crates/auth/src/browser_auth.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,5 @@
 | 
			
		||||
mod auth_server;
 | 
			
		||||
mod browser_auth_ext;
 | 
			
		||||
mod browser_auth_impl;
 | 
			
		||||
 | 
			
		||||
pub use browser_auth_ext::BrowserAuthenticator;
 | 
			
		||||
							
								
								
									
										57
									
								
								crates/auth/src/browser_auth/auth_server.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								crates/auth/src/browser_auth/auth_server.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,57 @@
 | 
			
		||||
use std::io::Cursor;
 | 
			
		||||
 | 
			
		||||
use log::info;
 | 
			
		||||
use tiny_http::{Header, Response, Server};
 | 
			
		||||
use uuid::Uuid;
 | 
			
		||||
 | 
			
		||||
pub(super) struct AuthServer {
 | 
			
		||||
  server: Server,
 | 
			
		||||
  auth_id: String,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl AuthServer {
 | 
			
		||||
  pub fn new() -> anyhow::Result<Self> {
 | 
			
		||||
    let server = Server::http("127.0.0.1:0").map_err(|err| anyhow::anyhow!(err))?;
 | 
			
		||||
    let auth_id = Uuid::new_v4().to_string();
 | 
			
		||||
 | 
			
		||||
    Ok(Self { server, auth_id })
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn auth_url(&self) -> String {
 | 
			
		||||
    format!("http://{}/{}", self.server.server_addr(), self.auth_id)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn serve_request(&self, auth_request: &str) {
 | 
			
		||||
    info!("auth server started at: {}", self.auth_url());
 | 
			
		||||
 | 
			
		||||
    for req in self.server.incoming_requests() {
 | 
			
		||||
      info!("received request, method: {}, url: {}", req.method(), req.url());
 | 
			
		||||
 | 
			
		||||
      if req.url() != format!("/{}", self.auth_id) {
 | 
			
		||||
        let forbidden = Response::from_string("forbidden").with_status_code(403);
 | 
			
		||||
        let _ = req.respond(forbidden);
 | 
			
		||||
      } else {
 | 
			
		||||
        let auth_response = build_auth_response(auth_request);
 | 
			
		||||
        if let Err(err) = req.respond(auth_response) {
 | 
			
		||||
          info!("failed to respond to request: {}", err);
 | 
			
		||||
        } else {
 | 
			
		||||
          info!("stop the auth server");
 | 
			
		||||
          break;
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn build_auth_response(auth_request: &str) -> Response<Cursor<Vec<u8>>> {
 | 
			
		||||
  if auth_request.starts_with("http") {
 | 
			
		||||
    let header = format!("location: {}", auth_request);
 | 
			
		||||
    let header: Header = header.parse().unwrap();
 | 
			
		||||
    Response::from_string("redirect")
 | 
			
		||||
      .with_status_code(302)
 | 
			
		||||
      .with_header(header)
 | 
			
		||||
  } else {
 | 
			
		||||
    let content_type: Header = "content-type: text/html".parse().unwrap();
 | 
			
		||||
    Response::from_string(auth_request).with_header(content_type)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										22
									
								
								crates/auth/src/browser_auth/browser_auth_ext.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								crates/auth/src/browser_auth/browser_auth_ext.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
use std::future::Future;
 | 
			
		||||
 | 
			
		||||
use gpapi::auth::SamlAuthData;
 | 
			
		||||
 | 
			
		||||
use crate::{browser_auth::browser_auth_impl::BrowserAuthenticatorImpl, AuthWindow};
 | 
			
		||||
 | 
			
		||||
pub trait BrowserAuthenticator {
 | 
			
		||||
  fn browser_authenticate(&self, browser: Option<&str>) -> impl Future<Output = anyhow::Result<SamlAuthData>> + Send;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl BrowserAuthenticator for AuthWindow<'_> {
 | 
			
		||||
  async fn browser_authenticate(&self, browser: Option<&str>) -> anyhow::Result<SamlAuthData> {
 | 
			
		||||
    let auth_request = self.initial_auth_request().await?;
 | 
			
		||||
    let browser_auth = if let Some(browser) = browser {
 | 
			
		||||
      BrowserAuthenticatorImpl::new_with_browser(&auth_request, browser)
 | 
			
		||||
    } else {
 | 
			
		||||
      BrowserAuthenticatorImpl::new(&auth_request)
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    browser_auth.authenticate().await
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										100
									
								
								crates/auth/src/browser_auth/browser_auth_impl.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								crates/auth/src/browser_auth/browser_auth_impl.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,100 @@
 | 
			
		||||
use std::{env::temp_dir, fs, os::unix::fs::PermissionsExt};
 | 
			
		||||
 | 
			
		||||
use gpapi::{auth::SamlAuthData, GP_CALLBACK_PORT_FILENAME};
 | 
			
		||||
use log::info;
 | 
			
		||||
use tokio::{io::AsyncReadExt, net::TcpListener};
 | 
			
		||||
 | 
			
		||||
use super::auth_server::AuthServer;
 | 
			
		||||
 | 
			
		||||
pub struct BrowserAuthenticatorImpl<'a> {
 | 
			
		||||
  auth_request: &'a str,
 | 
			
		||||
  browser: Option<&'a str>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl BrowserAuthenticatorImpl<'_> {
 | 
			
		||||
  pub fn new(auth_request: &str) -> BrowserAuthenticatorImpl {
 | 
			
		||||
    BrowserAuthenticatorImpl {
 | 
			
		||||
      auth_request,
 | 
			
		||||
      browser: None,
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn new_with_browser<'a>(auth_request: &'a str, browser: &'a str) -> BrowserAuthenticatorImpl<'a> {
 | 
			
		||||
    let browser = browser.trim();
 | 
			
		||||
    BrowserAuthenticatorImpl {
 | 
			
		||||
      auth_request,
 | 
			
		||||
      browser: if browser.is_empty() || browser == "default" {
 | 
			
		||||
        None
 | 
			
		||||
      } else {
 | 
			
		||||
        Some(browser)
 | 
			
		||||
      },
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub async fn authenticate(&self) -> anyhow::Result<SamlAuthData> {
 | 
			
		||||
    let auth_server = AuthServer::new()?;
 | 
			
		||||
    let auth_url = auth_server.auth_url();
 | 
			
		||||
 | 
			
		||||
    let auth_request = self.auth_request.to_string();
 | 
			
		||||
    tokio::spawn(async move {
 | 
			
		||||
      auth_server.serve_request(&auth_request);
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    if let Some(browser) = self.browser {
 | 
			
		||||
      let app = find_browser_path(browser);
 | 
			
		||||
 | 
			
		||||
      info!("Launching browser: {}", app);
 | 
			
		||||
      open::with_detached(auth_url, app)?;
 | 
			
		||||
    } else {
 | 
			
		||||
      info!("Launching the default browser...");
 | 
			
		||||
      webbrowser::open(&auth_url)?;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    info!("Please continue the authentication process in the default browser");
 | 
			
		||||
    wait_auth_data().await
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn find_browser_path(browser: &str) -> String {
 | 
			
		||||
  if browser == "chrome" {
 | 
			
		||||
    which::which("google-chrome-stable")
 | 
			
		||||
      .or_else(|_| which::which("google-chrome"))
 | 
			
		||||
      .or_else(|_| which::which("chromium"))
 | 
			
		||||
      .map(|path| path.to_string_lossy().to_string())
 | 
			
		||||
      .unwrap_or_else(|_| browser.to_string())
 | 
			
		||||
  } else {
 | 
			
		||||
    browser.into()
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async fn wait_auth_data() -> anyhow::Result<SamlAuthData> {
 | 
			
		||||
  // Start a local server to receive the browser authentication data
 | 
			
		||||
  let listener = TcpListener::bind("127.0.0.1:0").await?;
 | 
			
		||||
  let port = listener.local_addr()?.port();
 | 
			
		||||
  let port_file = temp_dir().join(GP_CALLBACK_PORT_FILENAME);
 | 
			
		||||
 | 
			
		||||
  // Write the port to a file
 | 
			
		||||
  fs::write(&port_file, port.to_string())?;
 | 
			
		||||
  fs::set_permissions(&port_file, fs::Permissions::from_mode(0o600))?;
 | 
			
		||||
 | 
			
		||||
  // Remove the previous log file
 | 
			
		||||
  let callback_log = temp_dir().join("gpcallback.log");
 | 
			
		||||
  let _ = fs::remove_file(&callback_log);
 | 
			
		||||
 | 
			
		||||
  info!("Listening authentication data on port {}", port);
 | 
			
		||||
  info!(
 | 
			
		||||
    "If it hangs, please check the logs at `{}` for more information",
 | 
			
		||||
    callback_log.display()
 | 
			
		||||
  );
 | 
			
		||||
  let (mut socket, _) = listener.accept().await?;
 | 
			
		||||
 | 
			
		||||
  info!("Received the browser authentication data from the socket");
 | 
			
		||||
  let mut data = String::new();
 | 
			
		||||
  socket.read_to_string(&mut data).await?;
 | 
			
		||||
 | 
			
		||||
  // Remove the port file
 | 
			
		||||
  fs::remove_file(&port_file)?;
 | 
			
		||||
 | 
			
		||||
  let auth_data = SamlAuthData::from_gpcallback(&data)?;
 | 
			
		||||
  Ok(auth_data)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										13
									
								
								crates/auth/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								crates/auth/src/lib.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,13 @@
 | 
			
		||||
mod auth_window;
 | 
			
		||||
pub use auth_window::AuthWindow;
 | 
			
		||||
pub use auth_window::auth_prelogin;
 | 
			
		||||
 | 
			
		||||
#[cfg(feature = "browser-auth")]
 | 
			
		||||
mod browser_auth;
 | 
			
		||||
#[cfg(feature = "browser-auth")]
 | 
			
		||||
pub use browser_auth::BrowserAuthenticator;
 | 
			
		||||
 | 
			
		||||
#[cfg(feature = "webview-auth")]
 | 
			
		||||
mod webview_auth;
 | 
			
		||||
#[cfg(feature = "webview-auth")]
 | 
			
		||||
pub use webview_auth::WebviewAuthenticator;
 | 
			
		||||
							
								
								
									
										9
									
								
								crates/auth/src/webview_auth.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								crates/auth/src/webview_auth.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
			
		||||
mod auth_messenger;
 | 
			
		||||
mod auth_response;
 | 
			
		||||
mod auth_settings;
 | 
			
		||||
mod webview_auth_ext;
 | 
			
		||||
 | 
			
		||||
#[cfg_attr(not(target_os = "macos"), path = "webview_auth/unix.rs")]
 | 
			
		||||
mod platform_impl;
 | 
			
		||||
 | 
			
		||||
pub use webview_auth_ext::WebviewAuthenticator;
 | 
			
		||||
							
								
								
									
										108
									
								
								crates/auth/src/webview_auth/auth_messenger.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										108
									
								
								crates/auth/src/webview_auth/auth_messenger.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,108 @@
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use gpapi::auth::SamlAuthData;
 | 
			
		||||
use log::{error, info};
 | 
			
		||||
use tokio::sync::{mpsc, RwLock};
 | 
			
		||||
use tokio_util::sync::CancellationToken;
 | 
			
		||||
 | 
			
		||||
pub enum AuthError {
 | 
			
		||||
  /// Failed to load page due to TLS error
 | 
			
		||||
  TlsError,
 | 
			
		||||
  /// 1. Found auth data in headers/body but it's invalid
 | 
			
		||||
  /// 2. Loaded an empty page, failed to load page. etc.
 | 
			
		||||
  Invalid,
 | 
			
		||||
  /// No auth data found in headers/body
 | 
			
		||||
  NotFound,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub type AuthResult = anyhow::Result<SamlAuthData, AuthError>;
 | 
			
		||||
 | 
			
		||||
pub enum AuthEvent {
 | 
			
		||||
  Data(SamlAuthData),
 | 
			
		||||
  Error(AuthError),
 | 
			
		||||
  RaiseWindow,
 | 
			
		||||
  Close,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub struct AuthMessenger {
 | 
			
		||||
  tx: mpsc::UnboundedSender<AuthEvent>,
 | 
			
		||||
  rx: RwLock<mpsc::UnboundedReceiver<AuthEvent>>,
 | 
			
		||||
  raise_window_cancel_token: RwLock<Option<CancellationToken>>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl AuthMessenger {
 | 
			
		||||
  pub fn new() -> Self {
 | 
			
		||||
    let (tx, rx) = mpsc::unbounded_channel();
 | 
			
		||||
 | 
			
		||||
    Self {
 | 
			
		||||
      tx,
 | 
			
		||||
      rx: RwLock::new(rx),
 | 
			
		||||
      raise_window_cancel_token: Default::default(),
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub async fn subscribe(&self) -> anyhow::Result<AuthEvent> {
 | 
			
		||||
    let mut rx = self.rx.write().await;
 | 
			
		||||
    if let Some(event) = rx.recv().await {
 | 
			
		||||
      return Ok(event);
 | 
			
		||||
    }
 | 
			
		||||
    bail!("Failed to receive auth event");
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn send_auth_event(&self, event: AuthEvent) {
 | 
			
		||||
    if let Err(event) = self.tx.send(event) {
 | 
			
		||||
      error!("Failed to send auth event: {}", event);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn send_auth_result(&self, result: AuthResult) {
 | 
			
		||||
    match result {
 | 
			
		||||
      Ok(data) => self.send_auth_data(data),
 | 
			
		||||
      Err(err) => self.send_auth_error(err),
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn send_auth_error(&self, err: AuthError) {
 | 
			
		||||
    self.send_auth_event(AuthEvent::Error(err));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn send_auth_data(&self, data: SamlAuthData) {
 | 
			
		||||
    self.send_auth_event(AuthEvent::Data(data));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn schedule_raise_window(&self, delay: u64) {
 | 
			
		||||
    let cancel_token = CancellationToken::new();
 | 
			
		||||
    let cancel_token_clone = cancel_token.clone();
 | 
			
		||||
 | 
			
		||||
    if let Ok(mut guard) = self.raise_window_cancel_token.try_write() {
 | 
			
		||||
      // Cancel the previous raise window task if it exists
 | 
			
		||||
      if let Some(token) = guard.take() {
 | 
			
		||||
        token.cancel();
 | 
			
		||||
      }
 | 
			
		||||
      *guard = Some(cancel_token_clone);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let tx = self.tx.clone();
 | 
			
		||||
    tokio::spawn(async move {
 | 
			
		||||
      info!("Displaying the window in {} second(s)...", delay);
 | 
			
		||||
 | 
			
		||||
      tokio::select! {
 | 
			
		||||
        _ = tokio::time::sleep(tokio::time::Duration::from_secs(delay)) => {
 | 
			
		||||
          if let Err(err) = tx.send(AuthEvent::RaiseWindow) {
 | 
			
		||||
            error!("Failed to send raise window event: {}", err);
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
        _ = cancel_token.cancelled() => {
 | 
			
		||||
          info!("Cancelled raise window task");
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn cancel_raise_window(&self) {
 | 
			
		||||
    if let Ok(mut cancel_token) = self.raise_window_cancel_token.try_write() {
 | 
			
		||||
      if let Some(token) = cancel_token.take() {
 | 
			
		||||
        token.cancel();
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										152
									
								
								crates/auth/src/webview_auth/auth_response.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										152
									
								
								crates/auth/src/webview_auth/auth_response.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,152 @@
 | 
			
		||||
use std::sync::Arc;
 | 
			
		||||
 | 
			
		||||
use gpapi::{
 | 
			
		||||
  auth::{AuthDataParseResult, SamlAuthData},
 | 
			
		||||
  error::AuthDataParseError,
 | 
			
		||||
};
 | 
			
		||||
use log::{info, warn};
 | 
			
		||||
use regex::Regex;
 | 
			
		||||
 | 
			
		||||
use crate::webview_auth::auth_messenger::{AuthError, AuthMessenger};
 | 
			
		||||
 | 
			
		||||
/// Trait for handling authentication response
 | 
			
		||||
pub trait AuthResponse {
 | 
			
		||||
  fn get_header(&self, key: &str) -> Option<String>;
 | 
			
		||||
  fn get_body<F>(&self, cb: F)
 | 
			
		||||
  where
 | 
			
		||||
    F: FnOnce(anyhow::Result<Vec<u8>>) + 'static;
 | 
			
		||||
 | 
			
		||||
  fn url(&self) -> Option<String>;
 | 
			
		||||
 | 
			
		||||
  fn is_acs_endpoint(&self) -> bool {
 | 
			
		||||
    self.url().map_or(false, |url| url.ends_with("/SAML20/SP/ACS"))
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn read_auth_data(auth_response: &impl AuthResponse, auth_messenger: &Arc<AuthMessenger>) {
 | 
			
		||||
  let auth_messenger = Arc::clone(auth_messenger);
 | 
			
		||||
 | 
			
		||||
  match read_from_headers(auth_response) {
 | 
			
		||||
    Ok(auth_data) => {
 | 
			
		||||
      info!("Found auth data in headers");
 | 
			
		||||
      auth_messenger.send_auth_data(auth_data);
 | 
			
		||||
    }
 | 
			
		||||
    Err(header_err) => {
 | 
			
		||||
      info!("Failed to read auth data from headers: {}", header_err);
 | 
			
		||||
 | 
			
		||||
      let is_acs_endpoint = auth_response.is_acs_endpoint();
 | 
			
		||||
      read_from_body(auth_response, move |auth_result| {
 | 
			
		||||
        // If the endpoint is `/SAML20/SP/ACS` and no auth data found in body, it should be considered as invalid
 | 
			
		||||
        let auth_result = auth_result.map_err(move |e| {
 | 
			
		||||
          info!("Failed to read auth data from body: {}", e);
 | 
			
		||||
          if is_acs_endpoint || e.is_invalid() || header_err.is_invalid() {
 | 
			
		||||
            AuthError::Invalid
 | 
			
		||||
          } else {
 | 
			
		||||
            AuthError::NotFound
 | 
			
		||||
          }
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        auth_messenger.send_auth_result(auth_result);
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn read_from_headers(auth_response: &impl AuthResponse) -> AuthDataParseResult {
 | 
			
		||||
  let Some(status) = auth_response.get_header("saml-auth-status") else {
 | 
			
		||||
    info!("No SAML auth status found in headers");
 | 
			
		||||
    return Err(AuthDataParseError::NotFound);
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  if status != "1" {
 | 
			
		||||
    info!("Found invalid auth status: {}", status);
 | 
			
		||||
    return Err(AuthDataParseError::Invalid);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let username = auth_response.get_header("saml-username");
 | 
			
		||||
  let prelogin_cookie = auth_response.get_header("prelogin-cookie");
 | 
			
		||||
  let portal_userauthcookie = auth_response.get_header("portal-userauthcookie");
 | 
			
		||||
 | 
			
		||||
  SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(|e| {
 | 
			
		||||
    warn!("Found invalid auth data: {}", e);
 | 
			
		||||
    AuthDataParseError::Invalid
 | 
			
		||||
  })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn read_from_body<F>(auth_response: &impl AuthResponse, cb: F)
 | 
			
		||||
where
 | 
			
		||||
  F: FnOnce(AuthDataParseResult) + 'static,
 | 
			
		||||
{
 | 
			
		||||
  auth_response.get_body(|body| match body {
 | 
			
		||||
    Ok(body) => {
 | 
			
		||||
      let html = String::from_utf8_lossy(&body);
 | 
			
		||||
      cb(read_from_html(&html))
 | 
			
		||||
    }
 | 
			
		||||
    Err(err) => {
 | 
			
		||||
      info!("Failed to read body: {}", err);
 | 
			
		||||
      cb(Err(AuthDataParseError::Invalid))
 | 
			
		||||
    }
 | 
			
		||||
  });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn read_from_html(html: &str) -> AuthDataParseResult {
 | 
			
		||||
  if html.contains("Temporarily Unavailable") {
 | 
			
		||||
    info!("Found 'Temporarily Unavailable' in HTML, auth failed");
 | 
			
		||||
    return Err(AuthDataParseError::Invalid);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  SamlAuthData::from_html(html).or_else(|err| {
 | 
			
		||||
    if let Some(gpcallback) = extract_gpcallback(html) {
 | 
			
		||||
      info!("Found gpcallback from html...");
 | 
			
		||||
      SamlAuthData::from_gpcallback(&gpcallback)
 | 
			
		||||
    } else {
 | 
			
		||||
      Err(err)
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn extract_gpcallback(html: &str) -> Option<String> {
 | 
			
		||||
  let re = Regex::new(r#"globalprotectcallback:[^"]+"#).unwrap();
 | 
			
		||||
  re.captures(html)
 | 
			
		||||
    .and_then(|captures| captures.get(0))
 | 
			
		||||
    .map(|m| html_escape::decode_html_entities(m.as_str()).to_string())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[cfg(test)]
 | 
			
		||||
mod tests {
 | 
			
		||||
  use super::*;
 | 
			
		||||
 | 
			
		||||
  #[test]
 | 
			
		||||
  fn extract_gpcallback_some() {
 | 
			
		||||
    let html = r#"
 | 
			
		||||
      <meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
 | 
			
		||||
      <meta http-equiv="refresh" content="0; URL=globalprotectcallback:PGh0bWw+PCEtLSA8c">
 | 
			
		||||
    "#;
 | 
			
		||||
 | 
			
		||||
    assert_eq!(
 | 
			
		||||
      extract_gpcallback(html).as_deref(),
 | 
			
		||||
      Some("globalprotectcallback:PGh0bWw+PCEtLSA8c")
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  #[test]
 | 
			
		||||
  fn extract_gpcallback_cas() {
 | 
			
		||||
    let html = r#"
 | 
			
		||||
      <meta http-equiv="refresh" content="0; URL=globalprotectcallback:cas-as=1&un=xyz@email.com&token=very_long_string">
 | 
			
		||||
    "#;
 | 
			
		||||
 | 
			
		||||
    assert_eq!(
 | 
			
		||||
      extract_gpcallback(html).as_deref(),
 | 
			
		||||
      Some("globalprotectcallback:cas-as=1&un=xyz@email.com&token=very_long_string")
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  #[test]
 | 
			
		||||
  fn extract_gpcallback_none() {
 | 
			
		||||
    let html = r#"
 | 
			
		||||
      <meta http-equiv="refresh" content="0; URL=PGh0bWw+PCEtLSA8c">
 | 
			
		||||
    "#;
 | 
			
		||||
 | 
			
		||||
    assert_eq!(extract_gpcallback(html), None);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										25
									
								
								crates/auth/src/webview_auth/auth_settings.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								crates/auth/src/webview_auth/auth_settings.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,25 @@
 | 
			
		||||
use std::sync::Arc;
 | 
			
		||||
 | 
			
		||||
use super::auth_messenger::AuthMessenger;
 | 
			
		||||
 | 
			
		||||
pub struct AuthRequest<'a>(&'a str);
 | 
			
		||||
 | 
			
		||||
impl<'a> AuthRequest<'a> {
 | 
			
		||||
  pub fn new(auth_request: &'a str) -> Self {
 | 
			
		||||
    Self(auth_request)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn is_url(&self) -> bool {
 | 
			
		||||
    self.0.starts_with("http")
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn as_str(&self) -> &str {
 | 
			
		||||
    self.0
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub struct AuthSettings<'a> {
 | 
			
		||||
  pub auth_request: AuthRequest<'a>,
 | 
			
		||||
  pub auth_messenger: Arc<AuthMessenger>,
 | 
			
		||||
  pub ignore_tls_errors: bool,
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										136
									
								
								crates/auth/src/webview_auth/unix.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										136
									
								
								crates/auth/src/webview_auth/unix.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,136 @@
 | 
			
		||||
use std::sync::Arc;
 | 
			
		||||
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use gpapi::utils::redact::redact_uri;
 | 
			
		||||
use log::{info, warn};
 | 
			
		||||
use webkit2gtk::{
 | 
			
		||||
  gio::Cancellable,
 | 
			
		||||
  glib::{GString, TimeSpan},
 | 
			
		||||
  LoadEvent, TLSErrorsPolicy, URIResponseExt, WebResource, WebResourceExt, WebView, WebViewExt, WebsiteDataManagerExt,
 | 
			
		||||
  WebsiteDataManagerExtManual, WebsiteDataTypes,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
use crate::webview_auth::{
 | 
			
		||||
  auth_messenger::AuthError,
 | 
			
		||||
  auth_response::read_auth_data,
 | 
			
		||||
  auth_settings::{AuthRequest, AuthSettings},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
use super::auth_response::AuthResponse;
 | 
			
		||||
 | 
			
		||||
impl AuthResponse for WebResource {
 | 
			
		||||
  fn get_header(&self, key: &str) -> Option<String> {
 | 
			
		||||
    self
 | 
			
		||||
      .response()
 | 
			
		||||
      .and_then(|response| response.http_headers())
 | 
			
		||||
      .and_then(|headers| headers.one(key))
 | 
			
		||||
      .map(GString::into)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fn get_body<F>(&self, cb: F)
 | 
			
		||||
  where
 | 
			
		||||
    F: FnOnce(anyhow::Result<Vec<u8>>) + 'static,
 | 
			
		||||
  {
 | 
			
		||||
    let cancellable = Cancellable::NONE;
 | 
			
		||||
    self.data(cancellable, |data| cb(data.map_err(|e| anyhow::anyhow!(e))));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fn url(&self) -> Option<String> {
 | 
			
		||||
    self.uri().map(GString::into)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn clear_data<F>(wv: &WebView, cb: F)
 | 
			
		||||
where
 | 
			
		||||
  F: FnOnce(anyhow::Result<()>) + Send + 'static,
 | 
			
		||||
{
 | 
			
		||||
  let Some(data_manager) = wv.website_data_manager() else {
 | 
			
		||||
    cb(Err(anyhow::anyhow!("Failed to get website data manager")));
 | 
			
		||||
    return;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  data_manager.clear(
 | 
			
		||||
    WebsiteDataTypes::COOKIES,
 | 
			
		||||
    TimeSpan(0),
 | 
			
		||||
    Cancellable::NONE,
 | 
			
		||||
    move |result| {
 | 
			
		||||
      cb(result.map_err(|e| anyhow::anyhow!(e)));
 | 
			
		||||
    },
 | 
			
		||||
  );
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn setup_webview(wv: &WebView, auth_settings: AuthSettings) -> anyhow::Result<()> {
 | 
			
		||||
  let AuthSettings {
 | 
			
		||||
    auth_request,
 | 
			
		||||
    auth_messenger,
 | 
			
		||||
    ignore_tls_errors,
 | 
			
		||||
  } = auth_settings;
 | 
			
		||||
  let auth_messenger_clone = Arc::clone(&auth_messenger);
 | 
			
		||||
 | 
			
		||||
  let Some(data_manager) = wv.website_data_manager() else {
 | 
			
		||||
    bail!("Failed to get website data manager");
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  if ignore_tls_errors {
 | 
			
		||||
    data_manager.set_tls_errors_policy(TLSErrorsPolicy::Ignore);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  wv.connect_load_changed(move |wv, event| {
 | 
			
		||||
    if event == LoadEvent::Started {
 | 
			
		||||
      auth_messenger_clone.cancel_raise_window();
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if event != LoadEvent::Finished {
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let Some(main_resource) = wv.main_resource() else {
 | 
			
		||||
      return;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    let uri = main_resource.uri().unwrap_or("".into());
 | 
			
		||||
    if uri.is_empty() {
 | 
			
		||||
      warn!("Loaded an empty URI");
 | 
			
		||||
      auth_messenger_clone.send_auth_error(AuthError::Invalid);
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    read_auth_data(&main_resource, &auth_messenger_clone);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  wv.connect_load_failed_with_tls_errors(move |_wv, uri, cert, err| {
 | 
			
		||||
    let redacted_uri = redact_uri(uri);
 | 
			
		||||
    warn!(
 | 
			
		||||
      "Failed to load uri: {} with error: {}, cert: {}",
 | 
			
		||||
      redacted_uri, err, cert
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    auth_messenger.send_auth_error(AuthError::TlsError);
 | 
			
		||||
    true
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  wv.connect_load_failed(move |_wv, _event, uri, err| {
 | 
			
		||||
    let redacted_uri = redact_uri(uri);
 | 
			
		||||
    if !uri.starts_with("globalprotectcallback:") {
 | 
			
		||||
      warn!("Failed to load uri: {} with error: {}", redacted_uri, err);
 | 
			
		||||
    }
 | 
			
		||||
    // NOTE: Don't send error here, since load_changed event will be triggered after this
 | 
			
		||||
    // true to stop other handlers from being invoked for the event. false to propagate the event further.
 | 
			
		||||
    true
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  load_auth_request(wv, &auth_request);
 | 
			
		||||
 | 
			
		||||
  Ok(())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn load_auth_request(wv: &WebView, auth_request: &AuthRequest) {
 | 
			
		||||
  if auth_request.is_url() {
 | 
			
		||||
    info!("Loading auth request as URI...");
 | 
			
		||||
    wv.load_uri(auth_request.as_str());
 | 
			
		||||
  } else {
 | 
			
		||||
    info!("Loading auth request as HTML...");
 | 
			
		||||
    wv.load_html(auth_request.as_str(), None);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										194
									
								
								crates/auth/src/webview_auth/webview_auth_ext.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										194
									
								
								crates/auth/src/webview_auth/webview_auth_ext.rs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,194 @@
 | 
			
		||||
use std::{
 | 
			
		||||
  future::Future,
 | 
			
		||||
  sync::Arc,
 | 
			
		||||
  time::{Duration, Instant},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use gpapi::{auth::SamlAuthData, error::PortalError, utils::window::WindowExt};
 | 
			
		||||
use log::{info, warn};
 | 
			
		||||
use tauri::{AppHandle, WebviewUrl, WebviewWindow, WindowEvent};
 | 
			
		||||
use tokio::{sync::oneshot, time};
 | 
			
		||||
 | 
			
		||||
use crate::{
 | 
			
		||||
  webview_auth::{
 | 
			
		||||
    auth_messenger::{AuthError, AuthEvent, AuthMessenger},
 | 
			
		||||
    auth_settings::{AuthRequest, AuthSettings},
 | 
			
		||||
    platform_impl,
 | 
			
		||||
  },
 | 
			
		||||
  AuthWindow,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
pub trait WebviewAuthenticator {
 | 
			
		||||
  fn with_clean(self, clean: bool) -> Self;
 | 
			
		||||
  fn webview_authenticate(&self, app_handle: &AppHandle) -> impl Future<Output = anyhow::Result<SamlAuthData>> + Send;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl WebviewAuthenticator for AuthWindow<'_> {
 | 
			
		||||
  fn with_clean(mut self, clean: bool) -> Self {
 | 
			
		||||
    self.clean = clean;
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  async fn webview_authenticate(&self, app_handle: &AppHandle) -> anyhow::Result<SamlAuthData> {
 | 
			
		||||
    let auth_window = WebviewWindow::builder(app_handle, "auth_window", WebviewUrl::default())
 | 
			
		||||
      .title("GlobalProtect Login")
 | 
			
		||||
      .focused(true)
 | 
			
		||||
      .visible(false)
 | 
			
		||||
      .center()
 | 
			
		||||
      .build()?;
 | 
			
		||||
 | 
			
		||||
    self.auth_loop(&auth_window).await
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl AuthWindow<'_> {
 | 
			
		||||
  async fn auth_loop(&self, auth_window: &WebviewWindow) -> anyhow::Result<SamlAuthData> {
 | 
			
		||||
    if self.clean {
 | 
			
		||||
      self.clear_webview_data(&auth_window).await?;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let auth_messenger = self.setup_auth_window(&auth_window).await?;
 | 
			
		||||
 | 
			
		||||
    loop {
 | 
			
		||||
      match auth_messenger.subscribe().await? {
 | 
			
		||||
        AuthEvent::Close => bail!("Authentication cancelled"),
 | 
			
		||||
        AuthEvent::RaiseWindow => self.raise_window(auth_window),
 | 
			
		||||
        AuthEvent::Error(AuthError::TlsError) => bail!(PortalError::TlsError),
 | 
			
		||||
        AuthEvent::Error(AuthError::NotFound) => self.handle_not_found(auth_window, &auth_messenger),
 | 
			
		||||
        AuthEvent::Error(AuthError::Invalid) => self.retry_auth(auth_window).await,
 | 
			
		||||
        AuthEvent::Data(auth_data) => {
 | 
			
		||||
          auth_window.close()?;
 | 
			
		||||
          return Ok(auth_data);
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  async fn clear_webview_data(&self, auth_window: &WebviewWindow) -> anyhow::Result<()> {
 | 
			
		||||
    info!("Clearing webview data...");
 | 
			
		||||
 | 
			
		||||
    let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
 | 
			
		||||
    let now = Instant::now();
 | 
			
		||||
    auth_window.with_webview(|webview| {
 | 
			
		||||
      platform_impl::clear_data(&webview.inner(), |result| {
 | 
			
		||||
        if let Err(result) = tx.send(result) {
 | 
			
		||||
          warn!("Failed to send clear data result: {:?}", result);
 | 
			
		||||
        }
 | 
			
		||||
      })
 | 
			
		||||
    })?;
 | 
			
		||||
 | 
			
		||||
    rx.await??;
 | 
			
		||||
    info!("Webview data cleared in {:?}", now.elapsed());
 | 
			
		||||
 | 
			
		||||
    Ok(())
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  async fn setup_auth_window(&self, auth_window: &WebviewWindow) -> anyhow::Result<Arc<AuthMessenger>> {
 | 
			
		||||
    info!("Setting up auth window...");
 | 
			
		||||
 | 
			
		||||
    let auth_messenger = Arc::new(AuthMessenger::new());
 | 
			
		||||
    let auth_request = self.initial_auth_request().await?.into_owned();
 | 
			
		||||
    let ignore_tls_errors = self.gp_params.ignore_tls_errors();
 | 
			
		||||
 | 
			
		||||
    // Handle window close event
 | 
			
		||||
    let auth_messenger_clone = Arc::clone(&auth_messenger);
 | 
			
		||||
    auth_window.on_window_event(move |event| {
 | 
			
		||||
      if let WindowEvent::CloseRequested { .. } = event {
 | 
			
		||||
        auth_messenger_clone.send_auth_event(AuthEvent::Close);
 | 
			
		||||
      }
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // Show the window after 10 seconds, so that the user can see the window if the auth process is stuck
 | 
			
		||||
    let auth_messenger_clone = Arc::clone(&auth_messenger);
 | 
			
		||||
    tokio::spawn(async move {
 | 
			
		||||
      time::sleep(Duration::from_secs(10)).await;
 | 
			
		||||
      auth_messenger_clone.send_auth_event(AuthEvent::RaiseWindow);
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // setup webview
 | 
			
		||||
    let auth_messenger_clone = Arc::clone(&auth_messenger);
 | 
			
		||||
    let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
 | 
			
		||||
 | 
			
		||||
    auth_window.with_webview(move |webview| {
 | 
			
		||||
      let auth_settings = AuthSettings {
 | 
			
		||||
        auth_request: AuthRequest::new(&auth_request),
 | 
			
		||||
        auth_messenger: auth_messenger_clone,
 | 
			
		||||
        ignore_tls_errors,
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      let result = platform_impl::setup_webview(&webview.inner(), auth_settings);
 | 
			
		||||
      if let Err(result) = tx.send(result) {
 | 
			
		||||
        warn!("Failed to send setup auth window result: {:?}", result);
 | 
			
		||||
      }
 | 
			
		||||
    })?;
 | 
			
		||||
 | 
			
		||||
    rx.await??;
 | 
			
		||||
    info!("Auth window setup completed");
 | 
			
		||||
 | 
			
		||||
    Ok(auth_messenger)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fn handle_not_found(&self, auth_window: &WebviewWindow, auth_messenger: &Arc<AuthMessenger>) {
 | 
			
		||||
    info!("No auth data found, it may not be the /SAML20/SP/ACS endpoint");
 | 
			
		||||
 | 
			
		||||
    let visible = auth_window.is_visible().unwrap_or(false);
 | 
			
		||||
    if visible {
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    auth_messenger.schedule_raise_window(1);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  async fn retry_auth(&self, auth_window: &WebviewWindow) {
 | 
			
		||||
    let mut is_retrying = self.is_retrying.write().await;
 | 
			
		||||
    if *is_retrying {
 | 
			
		||||
      info!("Already retrying authentication, skipping...");
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    *is_retrying = true;
 | 
			
		||||
    drop(is_retrying);
 | 
			
		||||
 | 
			
		||||
    if let Err(err) = self.retry_auth_impl(auth_window).await {
 | 
			
		||||
      warn!("Failed to retry authentication: {}", err);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    *self.is_retrying.write().await = false;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  async fn retry_auth_impl(&self, auth_window: &WebviewWindow) -> anyhow::Result<()> {
 | 
			
		||||
    info!("Retrying authentication...");
 | 
			
		||||
 | 
			
		||||
    auth_window.eval( r#"
 | 
			
		||||
      var loading = document.createElement("div");
 | 
			
		||||
      loading.innerHTML = '<div style="position: absolute; width: 100%; text-align: center; font-size: 20px; font-weight: bold; top: 50%; left: 50%; transform: translate(-50%, -50%);">Got invalid token, retrying...</div>';
 | 
			
		||||
      loading.style = "position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.85); z-index: 99999;";
 | 
			
		||||
      document.body.appendChild(loading);
 | 
			
		||||
    "#)?;
 | 
			
		||||
 | 
			
		||||
    let auth_request = self.portal_prelogin().await?;
 | 
			
		||||
    let (tx, rx) = oneshot::channel::<()>();
 | 
			
		||||
    auth_window.with_webview(move |webview| {
 | 
			
		||||
      let auth_request = AuthRequest::new(&auth_request);
 | 
			
		||||
      platform_impl::load_auth_request(&webview.inner(), &auth_request);
 | 
			
		||||
 | 
			
		||||
      tx.send(()).expect("Failed to send message to the channel")
 | 
			
		||||
    })?;
 | 
			
		||||
 | 
			
		||||
    rx.await?;
 | 
			
		||||
    Ok(())
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fn raise_window(&self, auth_window: &WebviewWindow) {
 | 
			
		||||
    let visible = auth_window.is_visible().unwrap_or(false);
 | 
			
		||||
    if visible {
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    info!("Raising auth window...");
 | 
			
		||||
    if let Err(err) = auth_window.raise() {
 | 
			
		||||
      warn!("Failed to raise window: {}", err);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "gpapi"
 | 
			
		||||
rust-version.workspace = true
 | 
			
		||||
version.workspace = true
 | 
			
		||||
edition.workspace = true
 | 
			
		||||
license = "MIT"
 | 
			
		||||
@@ -29,14 +30,11 @@ uzers.workspace = true
 | 
			
		||||
serde_urlencoded.workspace = true
 | 
			
		||||
md5.workspace = true
 | 
			
		||||
sha256.workspace = true
 | 
			
		||||
which.workspace = true
 | 
			
		||||
 | 
			
		||||
tauri = { workspace = true, optional = true }
 | 
			
		||||
clap = { workspace = true, optional = true }
 | 
			
		||||
open = { version = "5", optional = true }
 | 
			
		||||
webbrowser = { version = "1", optional = true }
 | 
			
		||||
 | 
			
		||||
[features]
 | 
			
		||||
tauri = ["dep:tauri"]
 | 
			
		||||
clap = ["dep:clap"]
 | 
			
		||||
browser-auth = ["dep:open", "dep:webbrowser"]
 | 
			
		||||
webview-auth = []
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,14 @@
 | 
			
		||||
use std::borrow::{Borrow, Cow};
 | 
			
		||||
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use log::{info, warn};
 | 
			
		||||
use regex::Regex;
 | 
			
		||||
use serde::{Deserialize, Serialize};
 | 
			
		||||
 | 
			
		||||
use crate::{error::AuthDataParseError, utils::base64::decode_to_string};
 | 
			
		||||
 | 
			
		||||
pub type AuthDataParseResult = anyhow::Result<SamlAuthData, AuthDataParseError>;
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Serialize, Deserialize)]
 | 
			
		||||
#[serde(rename_all = "camelCase")]
 | 
			
		||||
pub struct SamlAuthData {
 | 
			
		||||
@@ -33,33 +36,51 @@ impl SamlAuthResult {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl SamlAuthData {
 | 
			
		||||
  pub fn new(username: String, prelogin_cookie: Option<String>, portal_userauthcookie: Option<String>) -> Self {
 | 
			
		||||
    Self {
 | 
			
		||||
      username,
 | 
			
		||||
      prelogin_cookie,
 | 
			
		||||
      portal_userauthcookie,
 | 
			
		||||
      token: None,
 | 
			
		||||
  pub fn new(
 | 
			
		||||
    username: Option<String>,
 | 
			
		||||
    prelogin_cookie: Option<String>,
 | 
			
		||||
    portal_userauthcookie: Option<String>,
 | 
			
		||||
  ) -> anyhow::Result<Self> {
 | 
			
		||||
    let username = username.unwrap_or_default();
 | 
			
		||||
    if username.is_empty() {
 | 
			
		||||
      bail!("Invalid username: <empty>");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let prelogin_cookie = prelogin_cookie.unwrap_or_default();
 | 
			
		||||
    let portal_userauthcookie = portal_userauthcookie.unwrap_or_default();
 | 
			
		||||
 | 
			
		||||
    if prelogin_cookie.len() <= 5 && portal_userauthcookie.len() <= 5 {
 | 
			
		||||
      bail!(
 | 
			
		||||
        "Invalid prelogin-cookie: {}, portal-userauthcookie: {}",
 | 
			
		||||
        prelogin_cookie,
 | 
			
		||||
        portal_userauthcookie
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Ok(Self {
 | 
			
		||||
      username,
 | 
			
		||||
      prelogin_cookie: Some(prelogin_cookie),
 | 
			
		||||
      portal_userauthcookie: Some(portal_userauthcookie),
 | 
			
		||||
      token: None,
 | 
			
		||||
    })
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn from_html(html: &str) -> anyhow::Result<SamlAuthData, AuthDataParseError> {
 | 
			
		||||
  pub fn from_html(html: &str) -> AuthDataParseResult {
 | 
			
		||||
    match parse_xml_tag(html, "saml-auth-status") {
 | 
			
		||||
      Some(saml_status) if saml_status == "1" => {
 | 
			
		||||
      Some(status) if status == "1" => {
 | 
			
		||||
        let username = parse_xml_tag(html, "saml-username");
 | 
			
		||||
        let prelogin_cookie = parse_xml_tag(html, "prelogin-cookie");
 | 
			
		||||
        let portal_userauthcookie = parse_xml_tag(html, "portal-userauthcookie");
 | 
			
		||||
 | 
			
		||||
        if SamlAuthData::check(&username, &prelogin_cookie, &portal_userauthcookie) {
 | 
			
		||||
          Ok(SamlAuthData::new(
 | 
			
		||||
            username.unwrap(),
 | 
			
		||||
            prelogin_cookie,
 | 
			
		||||
            portal_userauthcookie,
 | 
			
		||||
          ))
 | 
			
		||||
        } else {
 | 
			
		||||
          Err(AuthDataParseError::Invalid)
 | 
			
		||||
        }
 | 
			
		||||
        SamlAuthData::new(username, prelogin_cookie, portal_userauthcookie).map_err(|e| {
 | 
			
		||||
          warn!("Failed to parse auth data: {}", e);
 | 
			
		||||
          AuthDataParseError::Invalid
 | 
			
		||||
        })
 | 
			
		||||
      }
 | 
			
		||||
      Some(status) => {
 | 
			
		||||
        warn!("Found invalid auth status: {}", status);
 | 
			
		||||
        Err(AuthDataParseError::Invalid)
 | 
			
		||||
      }
 | 
			
		||||
      Some(_) => Err(AuthDataParseError::Invalid),
 | 
			
		||||
      None => Err(AuthDataParseError::NotFound),
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
@@ -105,27 +126,6 @@ impl SamlAuthData {
 | 
			
		||||
  pub fn token(&self) -> Option<&str> {
 | 
			
		||||
    self.token.as_deref()
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn check(
 | 
			
		||||
    username: &Option<String>,
 | 
			
		||||
    prelogin_cookie: &Option<String>,
 | 
			
		||||
    portal_userauthcookie: &Option<String>,
 | 
			
		||||
  ) -> bool {
 | 
			
		||||
    let username_valid = username.as_ref().is_some_and(|username| !username.is_empty());
 | 
			
		||||
    let prelogin_cookie_valid = prelogin_cookie.as_ref().is_some_and(|val| val.len() > 5);
 | 
			
		||||
    let portal_userauthcookie_valid = portal_userauthcookie.as_ref().is_some_and(|val| val.len() > 5);
 | 
			
		||||
 | 
			
		||||
    let is_valid = username_valid && (prelogin_cookie_valid || portal_userauthcookie_valid);
 | 
			
		||||
 | 
			
		||||
    if !is_valid {
 | 
			
		||||
      warn!(
 | 
			
		||||
        "Invalid SAML auth data: username: {:?}, prelogin-cookie: {:?}, portal-userauthcookie: {:?}",
 | 
			
		||||
        username, prelogin_cookie, portal_userauthcookie
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    is_valid
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn parse_xml_tag(html: &str, tag: &str) -> Option<String> {
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,28 @@
 | 
			
		||||
use crate::error::PortalError;
 | 
			
		||||
 | 
			
		||||
pub mod args;
 | 
			
		||||
 | 
			
		||||
pub trait Args {
 | 
			
		||||
  fn fix_openssl(&self) -> bool;
 | 
			
		||||
  fn ignore_tls_errors(&self) -> bool;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn handle_error(err: anyhow::Error, args: &impl Args) {
 | 
			
		||||
  eprintln!("\nError: {}", err);
 | 
			
		||||
 | 
			
		||||
  let Some(err) = err.downcast_ref::<PortalError>() else {
 | 
			
		||||
    return;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  if err.is_legacy_openssl_error() && !args.fix_openssl() {
 | 
			
		||||
    eprintln!("\nRe-run it with the `--fix-openssl` option to work around this issue, e.g.:\n");
 | 
			
		||||
    let args = std::env::args().collect::<Vec<_>>();
 | 
			
		||||
    eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" "));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if err.is_tls_error() && !args.ignore_tls_errors() {
 | 
			
		||||
    eprintln!("\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n");
 | 
			
		||||
    let args = std::env::args().collect::<Vec<_>>();
 | 
			
		||||
    eprintln!("{} --ignore-tls-errors {}\n", args[0], args[1..].join(" "));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,19 @@ pub enum PortalError {
 | 
			
		||||
  #[error("Portal config error: {0}")]
 | 
			
		||||
  ConfigError(String),
 | 
			
		||||
  #[error("Network error: {0}")]
 | 
			
		||||
  NetworkError(String),
 | 
			
		||||
  NetworkError(#[from] reqwest::Error),
 | 
			
		||||
  #[error("TLS error")]
 | 
			
		||||
  TlsError,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl PortalError {
 | 
			
		||||
  pub fn is_legacy_openssl_error(&self) -> bool {
 | 
			
		||||
    format!("{:?}", self).contains("unsafe legacy renegotiation")
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn is_tls_error(&self) -> bool {
 | 
			
		||||
    matches!(self, PortalError::TlsError) || format!("{:?}", self).contains("certificate verify failed")
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Error, Debug)]
 | 
			
		||||
@@ -17,3 +29,9 @@ pub enum AuthDataParseError {
 | 
			
		||||
  #[error("Invalid auth data")]
 | 
			
		||||
  Invalid,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl AuthDataParseError {
 | 
			
		||||
  pub fn is_invalid(&self) -> bool {
 | 
			
		||||
    matches!(self, AuthDataParseError::Invalid)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
 | 
			
		||||
    .form(¶ms)
 | 
			
		||||
    .send()
 | 
			
		||||
    .await
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
 | 
			
		||||
 | 
			
		||||
  let res = parse_gp_response(res).await.map_err(|err| {
 | 
			
		||||
    warn!("{err}");
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,7 @@ pub const GP_API_KEY: &[u8; 32] = &[0; 32];
 | 
			
		||||
 | 
			
		||||
pub const GP_USER_AGENT: &str = "PAN GlobalProtect";
 | 
			
		||||
pub const GP_SERVICE_LOCK_FILE: &str = "/var/run/gpservice.lock";
 | 
			
		||||
pub const GP_CALLBACK_PORT_FILENAME: &str = "gpcallback.port";
 | 
			
		||||
 | 
			
		||||
#[cfg(not(debug_assertions))]
 | 
			
		||||
pub const GP_CLIENT_BINARY: &str = "/usr/bin/gpclient";
 | 
			
		||||
 
 | 
			
		||||
@@ -116,7 +116,7 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
 | 
			
		||||
    .form(¶ms)
 | 
			
		||||
    .send()
 | 
			
		||||
    .await
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
 | 
			
		||||
 | 
			
		||||
  let res_xml = parse_gp_response(res).await.or_else(|err| {
 | 
			
		||||
    if err.status == StatusCode::NOT_FOUND {
 | 
			
		||||
 
 | 
			
		||||
@@ -116,14 +116,12 @@ pub async fn prelogin(portal: &str, gp_params: &GpParams) -> anyhow::Result<Prel
 | 
			
		||||
 | 
			
		||||
  let client = Client::try_from(gp_params)?;
 | 
			
		||||
 | 
			
		||||
  info!("Perform prelogin, user_agent: {}", gp_params.user_agent());
 | 
			
		||||
 | 
			
		||||
  let res = client
 | 
			
		||||
    .post(&prelogin_url)
 | 
			
		||||
    .form(¶ms)
 | 
			
		||||
    .send()
 | 
			
		||||
    .await
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e.to_string())))?;
 | 
			
		||||
    .map_err(|e| anyhow::anyhow!(PortalError::NetworkError(e)))?;
 | 
			
		||||
 | 
			
		||||
  let res_xml = parse_gp_response(res).await.or_else(|err| {
 | 
			
		||||
    if err.status == StatusCode::NOT_FOUND {
 | 
			
		||||
 
 | 
			
		||||
@@ -14,10 +14,13 @@ pub struct SamlAuthLauncher<'a> {
 | 
			
		||||
  user_agent: Option<&'a str>,
 | 
			
		||||
  os: Option<&'a str>,
 | 
			
		||||
  os_version: Option<&'a str>,
 | 
			
		||||
  hidpi: bool,
 | 
			
		||||
  fix_openssl: bool,
 | 
			
		||||
  ignore_tls_errors: bool,
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  hidpi: bool,
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  clean: bool,
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  default_browser: bool,
 | 
			
		||||
  browser: Option<&'a str>,
 | 
			
		||||
}
 | 
			
		||||
@@ -31,10 +34,13 @@ impl<'a> SamlAuthLauncher<'a> {
 | 
			
		||||
      user_agent: None,
 | 
			
		||||
      os: None,
 | 
			
		||||
      os_version: None,
 | 
			
		||||
      hidpi: false,
 | 
			
		||||
      fix_openssl: false,
 | 
			
		||||
      ignore_tls_errors: false,
 | 
			
		||||
      #[cfg(feature = "webview-auth")]
 | 
			
		||||
      hidpi: false,
 | 
			
		||||
      #[cfg(feature = "webview-auth")]
 | 
			
		||||
      clean: false,
 | 
			
		||||
      #[cfg(feature = "webview-auth")]
 | 
			
		||||
      default_browser: false,
 | 
			
		||||
      browser: None,
 | 
			
		||||
    }
 | 
			
		||||
@@ -65,11 +71,6 @@ impl<'a> SamlAuthLauncher<'a> {
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn hidpi(mut self, hidpi: bool) -> Self {
 | 
			
		||||
    self.hidpi = hidpi;
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn fix_openssl(mut self, fix_openssl: bool) -> Self {
 | 
			
		||||
    self.fix_openssl = fix_openssl;
 | 
			
		||||
    self
 | 
			
		||||
@@ -80,11 +81,19 @@ impl<'a> SamlAuthLauncher<'a> {
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  pub fn hidpi(mut self, hidpi: bool) -> Self {
 | 
			
		||||
    self.hidpi = hidpi;
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  pub fn clean(mut self, clean: bool) -> Self {
 | 
			
		||||
    self.clean = clean;
 | 
			
		||||
    self
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  #[cfg(feature = "webview-auth")]
 | 
			
		||||
  pub fn default_browser(mut self, default_browser: bool) -> Self {
 | 
			
		||||
    self.default_browser = default_browser;
 | 
			
		||||
    self
 | 
			
		||||
@@ -120,10 +129,6 @@ impl<'a> SamlAuthLauncher<'a> {
 | 
			
		||||
      auth_cmd.arg("--os-version").arg(os_version);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if self.hidpi {
 | 
			
		||||
      auth_cmd.arg("--hidpi");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if self.fix_openssl {
 | 
			
		||||
      auth_cmd.arg("--fix-openssl");
 | 
			
		||||
    }
 | 
			
		||||
@@ -132,12 +137,19 @@ impl<'a> SamlAuthLauncher<'a> {
 | 
			
		||||
      auth_cmd.arg("--ignore-tls-errors");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if self.clean {
 | 
			
		||||
      auth_cmd.arg("--clean");
 | 
			
		||||
    }
 | 
			
		||||
    #[cfg(feature = "webview-auth")]
 | 
			
		||||
    {
 | 
			
		||||
      if self.hidpi {
 | 
			
		||||
        auth_cmd.arg("--hidpi");
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
    if self.default_browser {
 | 
			
		||||
      auth_cmd.arg("--default-browser");
 | 
			
		||||
      if self.clean {
 | 
			
		||||
        auth_cmd.arg("--clean");
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if self.default_browser {
 | 
			
		||||
        auth_cmd.arg("--default-browser");
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if let Some(browser) = self.browser {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,77 +0,0 @@
 | 
			
		||||
use std::{borrow::Cow, env::temp_dir, fs, io::Write, os::unix::fs::PermissionsExt};
 | 
			
		||||
 | 
			
		||||
use anyhow::bail;
 | 
			
		||||
use log::{info, warn};
 | 
			
		||||
 | 
			
		||||
pub struct BrowserAuthenticator<'a> {
 | 
			
		||||
  auth_request: &'a str,
 | 
			
		||||
  browser: Option<&'a str>,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl BrowserAuthenticator<'_> {
 | 
			
		||||
  pub fn new(auth_request: &str) -> BrowserAuthenticator {
 | 
			
		||||
    BrowserAuthenticator {
 | 
			
		||||
      auth_request,
 | 
			
		||||
      browser: None,
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn new_with_browser<'a>(auth_request: &'a str, browser: &'a str) -> BrowserAuthenticator<'a> {
 | 
			
		||||
    let browser = browser.trim();
 | 
			
		||||
    BrowserAuthenticator {
 | 
			
		||||
      auth_request,
 | 
			
		||||
      browser: if browser.is_empty() || browser == "default" {
 | 
			
		||||
        None
 | 
			
		||||
      } else {
 | 
			
		||||
        Some(browser)
 | 
			
		||||
      },
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  pub fn authenticate(&self) -> anyhow::Result<()> {
 | 
			
		||||
    let path = if self.auth_request.starts_with("http") {
 | 
			
		||||
      Cow::Borrowed(self.auth_request)
 | 
			
		||||
    } else {
 | 
			
		||||
      let html_file = temp_dir().join("gpauth.html");
 | 
			
		||||
 | 
			
		||||
      // Remove the file and error if permission denied
 | 
			
		||||
      if let Err(err) = fs::remove_file(&html_file) {
 | 
			
		||||
        if err.kind() != std::io::ErrorKind::NotFound {
 | 
			
		||||
          warn!("Failed to remove the temporary file: {}", err);
 | 
			
		||||
          bail!("Please remove the file manually: {:?}", html_file);
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      let mut file = fs::File::create(&html_file)?;
 | 
			
		||||
 | 
			
		||||
      file.set_permissions(fs::Permissions::from_mode(0o600))?;
 | 
			
		||||
      file.write_all(self.auth_request.as_bytes())?;
 | 
			
		||||
 | 
			
		||||
      Cow::Owned(html_file.to_string_lossy().to_string())
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    if let Some(browser) = self.browser {
 | 
			
		||||
      let app = find_browser_path(browser);
 | 
			
		||||
 | 
			
		||||
      info!("Launching browser: {}", app);
 | 
			
		||||
      open::with_detached(path.as_ref(), app)?;
 | 
			
		||||
    } else {
 | 
			
		||||
      info!("Launching the default browser...");
 | 
			
		||||
      webbrowser::open(path.as_ref())?;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Ok(())
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn find_browser_path(browser: &str) -> String {
 | 
			
		||||
  if browser == "chrome" {
 | 
			
		||||
    which::which("google-chrome-stable")
 | 
			
		||||
      .or_else(|_| which::which("google-chrome"))
 | 
			
		||||
      .or_else(|_| which::which("chromium"))
 | 
			
		||||
      .map(|path| path.to_string_lossy().to_string())
 | 
			
		||||
      .unwrap_or_else(|_| browser.to_string())
 | 
			
		||||
  } else {
 | 
			
		||||
    browser.into()
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -2,8 +2,6 @@ pub(crate) mod command_traits;
 | 
			
		||||
pub(crate) mod gui_helper_launcher;
 | 
			
		||||
 | 
			
		||||
pub mod auth_launcher;
 | 
			
		||||
#[cfg(feature = "browser-auth")]
 | 
			
		||||
pub mod browser_authenticator;
 | 
			
		||||
pub mod gui_launcher;
 | 
			
		||||
pub mod hip_launcher;
 | 
			
		||||
pub mod service_launcher;
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,4 @@ use super::vpn_state::VpnState;
 | 
			
		||||
pub enum WsEvent {
 | 
			
		||||
  VpnState(VpnState),
 | 
			
		||||
  ActiveGui,
 | 
			
		||||
  /// External authentication data
 | 
			
		||||
  AuthData(String),
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,17 +7,12 @@ use tokio::process::Command;
 | 
			
		||||
 | 
			
		||||
pub trait WindowExt {
 | 
			
		||||
  fn raise(&self) -> anyhow::Result<()>;
 | 
			
		||||
  fn hide_menu(&self);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl WindowExt for WebviewWindow {
 | 
			
		||||
  fn raise(&self) -> anyhow::Result<()> {
 | 
			
		||||
    raise_window(self)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fn hide_menu(&self) {
 | 
			
		||||
    hide_menu(self);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
 | 
			
		||||
@@ -40,7 +35,7 @@ pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
 | 
			
		||||
 | 
			
		||||
  // Calling window.show() on Windows will cause the menu to be shown.
 | 
			
		||||
  // We need to hide it again.
 | 
			
		||||
  hide_menu(win);
 | 
			
		||||
  win.hide_menu()?;
 | 
			
		||||
 | 
			
		||||
  Ok(())
 | 
			
		||||
}
 | 
			
		||||
@@ -76,22 +71,3 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
 | 
			
		||||
 | 
			
		||||
  Ok(exit_status)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn hide_menu(win: &WebviewWindow) {
 | 
			
		||||
  // let menu_handle = win.menu_handle();
 | 
			
		||||
 | 
			
		||||
  // tokio::spawn(async move {
 | 
			
		||||
  //   loop {
 | 
			
		||||
  //     let menu_visible = menu_handle.is_visible().unwrap_or(false);
 | 
			
		||||
 | 
			
		||||
  //     if !menu_visible {
 | 
			
		||||
  //       break;
 | 
			
		||||
  //     }
 | 
			
		||||
 | 
			
		||||
  //     if menu_visible {
 | 
			
		||||
  //       let _ = menu_handle.hide();
 | 
			
		||||
  //       tokio::time::sleep(Duration::from_millis(10)).await;
 | 
			
		||||
  //     }
 | 
			
		||||
  //   }
 | 
			
		||||
  // });
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user