Skip to content

Commit

Permalink
update check after login. issue #133
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-dimension
j-dimension committed Jan 15, 2024
1 parent 0815747 commit a54ff96
Show file tree
Hide file tree
Showing 3 changed files with 189 additions and 19 deletions.
24 changes: 21 additions & 3 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/LoginDialog.form
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<NonVisualComponents>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
Expand Down Expand Up @@ -59,7 +59,10 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="51" max="-2" attributes="0"/>
<Component id="jTabbedPane1" min="-2" pref="683" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="jTabbedPane1" min="-2" pref="683" max="-2" attributes="0"/>
<Component id="lblAutoUpdate" max="32767" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
Expand All @@ -71,7 +74,9 @@
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jTabbedPane1" min="-2" pref="448" max="-2" attributes="0"/>
<EmptySpace pref="49" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblAutoUpdate" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="43" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -986,6 +991,19 @@
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="lblAutoUpdate">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font bold="true" component="lblAutoUpdate" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
<Property name="text" type="java.lang.String" value="jLabel18"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
Expand Down
112 changes: 96 additions & 16 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/LoginDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@
import com.jdimension.jlawyer.client.settings.UserSettings;
import com.jdimension.jlawyer.client.utils.DesktopUtils;
import com.jdimension.jlawyer.client.utils.FrameUtils;
import com.jdimension.jlawyer.client.utils.ThreadUtils;
import com.jdimension.jlawyer.client.utils.VersionUtils;
import com.jdimension.jlawyer.jlawyerbox.BoxAccess;
import com.jdimension.jlawyer.security.Crypto;
Expand All @@ -680,14 +681,21 @@
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.event.KeyEvent;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
import javax.ejb.EJBAccessException;
import javax.naming.Context;
import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.JProgressBar;
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
import themes.colors.DefaultColorTheme;

Expand All @@ -706,6 +714,7 @@ public class LoginDialog extends javax.swing.JFrame {

/**
* Creates new form LoginDialog
*
* @param initialStatus
* @param cmdHost
* @param cmdPort
Expand All @@ -720,13 +729,11 @@ public class LoginDialog extends javax.swing.JFrame {
*/
public LoginDialog(String initialStatus, String cmdHost, String cmdPort, String cmdUser, String cmdPassword, String cmdSecMode, String cmdSshHost, String cmdSshPort, String cmdSshUser, String cmdSshPwd, String cmdSshTargetPort) {
initComponents();

Color highlightColor = new Color(DefaultColorTheme.COLOR_DARK_GREY.getRed(), DefaultColorTheme.COLOR_DARK_GREY.getGreen(), DefaultColorTheme.COLOR_DARK_GREY.getBlue(), 170);
this.jPanel5.setBackground(highlightColor);

this.setTitle(this.getTitle() + " | Version " + VersionUtils.getFullClientVersion());


this.setTitle(this.getTitle() + " | Version " + VersionUtils.getFullClientVersion());

this.jTabbedPane1.setForegroundAt(0, DefaultColorTheme.COLOR_LOGO_BLUE);
this.jTabbedPane1.setForegroundAt(1, DefaultColorTheme.COLOR_LOGO_BLUE);
Expand All @@ -736,9 +743,9 @@ public LoginDialog(String initialStatus, String cmdHost, String cmdPort, String
this.jTabbedPane1.setOpaque(false);
this.jTabbedPane1.putClientProperty("TabbedPane.contentOpaque", Boolean.FALSE);
this.jTabbedPane1.putClientProperty("TabbedPane.tabsOpaque", Boolean.FALSE);
this.jTabbedPane1.putClientProperty( "JTabbedPane.tabAreaAlignment", "center" );
this.jTabbedPane1.putClientProperty("JTabbedPane.tabAreaAlignment", "center");
// end

ImageIcon image = new ImageIcon(getClass().getResource("/images/login-background-dark.jpg"));
this.bgPanel.setBackgroundImage(image.getImage());

Expand All @@ -756,7 +763,7 @@ public LoginDialog(String initialStatus, String cmdHost, String cmdPort, String
this.pwPassword.setFont(font.deriveFont(Font.BOLD, 24));
this.pwPassword.setForeground(DefaultColorTheme.COLOR_LOGO_BLUE);
this.pwPassword.putClientProperty("JTextField.leadingIcon", new javax.swing.ImageIcon(getClass().getResource("/com/jdimension/jlawyer/client/baseline_password_black_24dp.png")));

this.cmdLogin.setFont(font.deriveFont(Font.BOLD, 24));
this.cmdSaveProfile.setFont(font.deriveFont(Font.BOLD, 20));

Expand Down Expand Up @@ -804,7 +811,7 @@ public LoginDialog(String initialStatus, String cmdHost, String cmdPort, String
this.txtSshPort.setFont(font.deriveFont(Font.BOLD, 12));
this.txtSshUser.setFont(font.deriveFont(Font.BOLD, 12));
this.pwdSshPassword.setFont(font.deriveFont(Font.BOLD, 12));
this.pwdSshPassword.putClientProperty( "FlatLaf.style", "showRevealButton: false" );
this.pwdSshPassword.putClientProperty("FlatLaf.style", "showRevealButton: false");
this.txtTargetPort.setFont(font.deriveFont(Font.BOLD, 12));

this.jLabel5.setFont(font.deriveFont(Font.BOLD, 12));
Expand Down Expand Up @@ -991,6 +998,7 @@ public void paintComponent(Graphics g) {
jLabel14 = new javax.swing.JLabel();
jLabel15 = new javax.swing.JLabel();
jLabel3 = new javax.swing.JLabel();
lblAutoUpdate = new javax.swing.JLabel();

jButton1.setText("jButton1");

Expand Down Expand Up @@ -1535,6 +1543,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/j-lawyer-logo-login.png"))); // NOI18N

lblAutoUpdate.setFont(lblAutoUpdate.getFont().deriveFont(lblAutoUpdate.getFont().getStyle() | java.awt.Font.BOLD));
lblAutoUpdate.setForeground(new java.awt.Color(255, 255, 255));
lblAutoUpdate.setText("jLabel18");

org.jdesktop.layout.GroupLayout bgPanelLayout = new org.jdesktop.layout.GroupLayout(bgPanel);
bgPanel.setLayout(bgPanelLayout);
bgPanelLayout.setHorizontalGroup(
Expand All @@ -1545,7 +1557,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(72, 72, 72))
.add(bgPanelLayout.createSequentialGroup()
.add(51, 51, 51)
.add(jTabbedPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 683, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(bgPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
.add(jTabbedPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 683, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(lblAutoUpdate, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
bgPanelLayout.setVerticalGroup(
Expand All @@ -1555,7 +1569,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.add(jLabel3)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jTabbedPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 448, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addContainerGap(49, Short.MAX_VALUE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(lblAutoUpdate)
.addContainerGap(43, Short.MAX_VALUE))
);

org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
Expand Down Expand Up @@ -1755,16 +1771,79 @@ private void loginPerformed(boolean saveProfile) {
}

settings.setConfiguration(ClientSettings.CONF_LASTCONNECTION, this.cmbCurrentConnection.getSelectedItem().toString());
if(saveProfile) {

if (saveProfile) {
// save profile in case user changed the user name
this.cmdSaveProfileActionPerformed(null);
}

String serverVersion = VersionUtils.getServerVersion();
String clientVersion = VersionUtils.getFullClientVersion();
if (!VersionUtils.isCompatible(serverVersion, clientVersion)) {
int response = JOptionPane.showConfirmDialog(this, java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/LoginDialog").getString("msg.compatibilitycheck.failed"), new Object[]{clientVersion, serverVersion, System.getProperty("line.separator")}), java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/LoginDialog").getString("msg.compatibilitycheck"), JOptionPane.YES_NO_OPTION);
String currentClientVersion = VersionUtils.getFullClientVersion();
String latestClientVersion = VersionUtils.getLatestClientVersionForServer(serverVersion);
if (latestClientVersion != null && !(latestClientVersion.equals(currentClientVersion))) {
// provide download option
int response = JOptionPane.showConfirmDialog(this, "Für diesen Arbeitsplatz liegt ein Update vor. Jetzt herunterladen?", "Update verfügbar", JOptionPane.YES_NO_OPTION);
if (response == JOptionPane.YES_OPTION) {

lblAutoUpdate.setText("Lade Installer für Version " + latestClientVersion + "...");

Thread downloadThread = new Thread(() -> {

try {
String downloadUrl=VersionUtils.getLatestClientDownloadForServer(serverVersion);
URL updateURL = new URL(downloadUrl);
URLConnection urlCon = updateURL.openConnection();
urlCon.setRequestProperty("User-Agent", "j-lawyer Client v" + VersionUtils.getFullClientVersion());
urlCon.setConnectTimeout(1500);
urlCon.setReadTimeout(3500);


String userHome = System.getProperty("user.home");
String downloadsFolder = userHome + System.getProperty("file.separator") + "Downloads";
File tmpF = new File(downloadsFolder + File.separator + downloadUrl.substring(downloadUrl.lastIndexOf("=")+1));

try (InputStream is = urlCon.getInputStream(); FileOutputStream fOut = new FileOutputStream(tmpF)) {

byte[] buffer = new byte[1024*1024];
int len = 0;
while ((len = is.read(buffer)) > -1) {
fOut.write(buffer, 0, len);
ThreadUtils.updateLabel(lblAutoUpdate, len + " bytes");
lblAutoUpdate.setText(len + " bytes");
lblAutoUpdate.repaint();
lblAutoUpdate.revalidate();
final int byteLen=len;
SwingUtilities.invokeAndWait(() -> {
lblAutoUpdate.setText(byteLen + " bytes");
});
System.out.println(len + " bytes");
}
}


DesktopUtils.openFileManager(new File(downloadsFolder));
} catch (Exception ex) {
log.error(ex);
}

ThreadUtils.updateLabel(lblAutoUpdate, "100%");
ThreadUtils.repaintComponent(lblAutoUpdate);

});
downloadThread.start();

try {
// Wait for the thread to finish using the join() method
downloadThread.join();
} catch (InterruptedException e) {
log.error(e);
}
}

}

if (!VersionUtils.isCompatible(serverVersion, currentClientVersion)) {
int response = JOptionPane.showConfirmDialog(this, java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/LoginDialog").getString("msg.compatibilitycheck.failed"), new Object[]{currentClientVersion, serverVersion, System.getProperty("line.separator")}), java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/LoginDialog").getString("msg.compatibilitycheck"), JOptionPane.YES_NO_OPTION);
if (response == JOptionPane.NO_OPTION) {
this.cmdLogin.setEnabled(true);
launching = false;
Expand All @@ -1788,7 +1867,7 @@ private void loginPerformed(boolean saveProfile) {

new Thread(new SplashThread(splash, settings, this)).start();
}

private void rdSecNoneActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdSecNoneActionPerformed
this.highlightSecuritySelection();
}//GEN-LAST:event_rdSecNoneActionPerformed
Expand Down Expand Up @@ -1987,6 +2066,7 @@ public static void main(String args[]) {
private javax.swing.JPanel jPanel6;
private javax.swing.JPanel jPanel7;
private javax.swing.JTabbedPane jTabbedPane1;
private javax.swing.JLabel lblAutoUpdate;
private javax.swing.JLabel lblBoxOutput;
private javax.swing.JLabel lblHint;
private javax.swing.JLabel lblProfile;
Expand Down
72 changes: 72 additions & 0 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/utils/VersionUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,19 @@

import com.jdimension.jlawyer.client.settings.ClientSettings;
import com.jdimension.jlawyer.services.JLawyerServiceLocator;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.URL;
import java.net.URLConnection;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;

/**
*
Expand All @@ -675,6 +687,66 @@ public class VersionUtils {

private static final Logger log = Logger.getLogger(VersionUtils.class.getName());

public static String getLatestClientDownloadForServer(String serverVersion) {
return getLatestClientForServer(serverVersion, "url");
}

public static String getLatestClientVersionForServer(String serverVersion) {
return getLatestClientForServer(serverVersion, "client");
}

private static String getLatestClientForServer(String serverVersion, String queryAttribute) {
try {
URL updateURL = new URL("https://www.j-lawyer.org/downloads/j-lawyer-autoupdate.xml");
URLConnection urlCon = updateURL.openConnection();
urlCon.setRequestProperty("User-Agent", "j-lawyer Client v" + VersionUtils.getFullClientVersion());
urlCon.setConnectTimeout(2000);
urlCon.setReadTimeout(3000);

InputStream is = urlCon.getInputStream();
InputStreamReader reader = new InputStreamReader(is, "UTF-8");

char[] buffer = new char[1024];
int len = 0;
StringBuilder sb = new StringBuilder();
while ((len = reader.read(buffer)) > -1) {
sb.append(buffer, 0, len);
}
reader.close();
is.close();
String calculationsContent = sb.toString();

DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
try {
dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
} catch (IllegalArgumentException iae) {
log.warn("Unable to set external entity restrictions in XML parser", iae);
}
DocumentBuilder remoteDb = dbf.newDocumentBuilder();
InputSource inSrc1 = new InputSource(new StringReader(calculationsContent));
inSrc1.setEncoding("UTF-8");
Document remoteDoc = remoteDb.parse(inSrc1);

NodeList remoteList = remoteDoc.getElementsByTagName("server");

for (int i = 0; i < remoteList.getLength(); i++) {
Node n = remoteList.item(i);
String server = n.getAttributes().getNamedItem("version").getNodeValue();
String client = n.getAttributes().getNamedItem("client").getNodeValue();
String os = n.getAttributes().getNamedItem("os").getNodeValue();
String arch = n.getAttributes().getNamedItem("arch").getNodeValue();
if (serverVersion.equals(server) && System.getProperty("os.name").toLowerCase().contains(os) && System.getProperty("os.arch").toLowerCase().contains(arch)) {
return n.getAttributes().getNamedItem(queryAttribute).getNodeValue();
}
}

} catch (Throwable t) {
log.error("Error downloading client version information", t);
}
return null;
}

public static String getClientVersion() {
return "2.6";
}
Expand Down

0 comments on commit a54ff96

Please sign in to comment.